vim: don't set undodir in nvim

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 9d85de212acfdca0deaf1936ac1d3114f86faa7f..092f59489d404dfec4cb9c6034999938d976d318 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -257,7 +257,7 @@ set formatoptions+=l    " do not wrap lines that have been longer when starting
 set formatoptions+=t    " Auto-wrap text using textwidth
 set formatoptions-=o    " Do not insert comment leader after hitting o or O in normal mode
 
-set nrformats=hex               " number formats recognized for CTRL-A and CTRL-X commands
+set nrformats-=octal    " don't inc/dec octal numbers with ^[AX]
 
 set complete=.       " scan the current buffer ( 'wrapscan' is ignored)
 set complete+=w      " scan buffers from other windows
@@ -309,7 +309,9 @@ set backupskip+=.netrc          " skip netrc
 set backupskip+=/dev/shm/pass*  " skip passwordstore files
 
 set undofile                    " persistent undo history
-set undodir=$XDG_CACHE_HOME/vim/undo//
+if !has('nvim')
+  set undodir=$XDG_CACHE_HOME/vim/undo//
+endif
 
 augroup undoskip
     au!