summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2014-08-21 14:56:06 +0200
committerJan Pokorný <jpokorny@redhat.com>2014-08-21 14:56:06 +0200
commit1d872eeb449cad98e9bbe7b640ace06e5cff3c11 (patch)
treef516ef3e919e54d637e9732c56209b52ab8bdd24
parent72f962e08f73f1f8467f2ea62358bd5b89981dc2 (diff)
downloaddotfiles-1d872eeb449cad98e9bbe7b640ace06e5cff3c11.zip
dotfiles-1d872eeb449cad98e9bbe7b640ace06e5cff3c11.tar.gz
dotfiles-1d872eeb449cad98e9bbe7b640ace06e5cff3c11.tar.xz
Fix vimdiff (previously allged to be by plugins) issue better
...as it turned up to be an interactive shell incompatibility hitch (isn't this a bug in vimdiff as such?). Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
-rw-r--r--.bashrc1
-rw-r--r--.vimrc6
2 files changed, 6 insertions, 1 deletions
diff --git a/.bashrc b/.bashrc
index 1bddb89..52c23cf 100644
--- a/.bashrc
+++ b/.bashrc
@@ -104,7 +104,6 @@ alias fname='find -name'
alias mk='make -j$( \
nproc --ignore=1 2>/dev/null \
|| sed "s|.*\([0-9]\+\)$|\1|" /sys/devices/system/cpu/online; )'
-alias vimdiff='vimdiff -u NONE'
# internal, debug, etc.
alias hist-del-last='history -d $(history 1 | cut -d" " -f2)' # historical NOOP
diff --git a/.vimrc b/.vimrc
index d65b174..f27cd09 100644
--- a/.vimrc
+++ b/.vimrc
@@ -48,6 +48,12 @@ let NERDTreeIgnore = ['\.pyc$', '\.tar\.gz$']
"
" others
"
+if &diff
+ " pass setting shell for vimdiff as it caused auto-stop for some reason
+else
+ " normal mode
+ set shell=/bin/bash\ -i
+endif
" http://vim.wikia.com/wiki/Always_start_on_first_line_of_git_commit_message
au FileType gitcommit au! BufEnter COMMIT_EDITMSG call setpos('.', [0, 1, 1, 0])