From: Ian Kelling Date: Wed, 28 Sep 2016 01:02:58 +0000 (-0700) Subject: emacs readline-complete bash 4.4 fix X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=commitdiff_plain;h=26e7e6b8a9237186ae25c5c2ce66367d313e9892 emacs readline-complete bash 4.4 fix --- diff --git a/.bashrc b/.bashrc index 6fe4174..6889b83 100644 --- a/.bashrc +++ b/.bashrc @@ -118,11 +118,11 @@ shopt -s globstar # inside emacs fixes -if [[ $INSIDE_EMACS ]]; then +if [[ $RLC_INSIDE_EMACS ]]; then # EMACS is used by bash on startup, but we don't need it anymore. # plus I hit a bug in a makefile which inherited it unset EMACS - export INSIDE_EMACS + export RLC_INSIDE_EMACS export PAGER=cat export MANPAGER=cat # scp completion does not work, but this doesn't fix it. todo, figure this out @@ -155,7 +155,7 @@ fi if [[ $- == *i* ]]; then # for readline-complete.el - if [[ $INSIDE_EMACS ]]; then + if [[ $RLC_INSIDE_EMACS ]]; then # all for readline-complete.el stty echo bind 'set horizontal-scroll-mode on' @@ -1355,7 +1355,7 @@ if [[ $- == *i* ]]; then shopt -s autocd shopt -s dirspell PS1='\w' - if [[ $- == *i* ]] && [[ ! $INSIDE_EMACS ]]; then + if [[ $- == *i* ]] && [[ ! $RLC_INSIDE_EMACS ]]; then PROMPT_DIRTRIM=2 bind -m vi-command B:shell-backward-word bind -m vi-command W:shell-forward-word