vim: include bin in nrformats, i.e. only disable octal

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index d5b0610ee2710ced425e2c7d7ee3ab3ef383d6ed..9af477ef6cbb071428d725a65319237fe8bc8502 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -224,7 +224,9 @@ set ttyfast
 
 " using the mouse {{{2
 set mouse=rnv                   " list of flags for using the mouse
-set ttymouse=xterm              " type of mouse
+if !has('nvim')
+  set ttymouse=xterm              " type of mouse
+endif
 
 " messages and info {{{2
 set showcmd         " Show (partial) command in status line.
@@ -255,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