vimrc: Fix last commit for Vims without eval.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 2769ffd6e083b48c022fa8edbaefae70e39cc975..9fcf7454fe5c672fa6b1ae79e3e37e38cb21f07b 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -11,9 +11,18 @@ if $HOME == '/root' || exists('$SUDO_USER')
 endif
 
 
+" Save 'runtimepath' in case it was changed by the system's configuration
+" files.
+if has('eval')
+    let s:save_runtimepath = &runtimepath
+endif
 " Reset all options (except 'term, 'lines' and 'columns'). This makes sure a
 " system wide configuration file doesn't change default values.
 set all&
+" And restore it after all other options were reset.
+if has('eval')
+    let &runtimepath = s:save_runtimepath
+endif
 
 " Make sure Vim (and not Vi) settings are used.
 set nocompatible
@@ -23,6 +32,9 @@ set nocompatible
 set runtimepath-=~/.vim
 set runtimepath^=~/.vim,~/.vim/runtime
 
+" Don't store swap files in the same directory as the edited file.
+set directory-=.
+
 " Disable modelines as they may cause security problems. Instead use
 " securemodelines (Vim script #1876).
 set nomodeline
@@ -111,12 +123,21 @@ set background=dark
 
 " Display line numbers.
 set number
+" But use as little space as necessary for the numbers column. Thanks to James
+" Vega (http://git.jamessan.com/?p=etc/vim.git;a=summary).
+if v:version >= 700
+    set numberwidth=1
+endif
 " Display the ruler with current line/file position. If 'statusline' is used
 " then this only affects <C-g>.
 set ruler
 " Display partial commands in the status line.
 set showcmd
 
+" Don't redraw screen when executing macros; increases speed. Thanks to James
+" Vega (http://git.jamessan.com/?p=etc/vim.git;a=summary).
+set lazyredraw
+
 " Visualize the line the cursor is currently in.
 if v:version >= 700
     set cursorline
@@ -156,6 +177,17 @@ endif
 
 " MAPPINGS (except for plugins, see PLUGIN SETTINGS below)
 
+" Disable arrow keys for all modes except command modes. Thanks to James Vega
+" (http://git.jamessan.com/?p=etc/vim.git;a=summary).
+map <right> <nop>
+map <left>  <nop>
+map <up>    <nop>
+map <down>  <nop>
+imap <right> <nop>
+imap <left>  <nop>
+imap <up>    <nop>
+imap <down>  <nop>
+
 " Use <space> to move down a page and - to move up one like in mutt.
 nnoremap <Space> <C-f>
 nnoremap - <C-b>
@@ -237,6 +269,11 @@ endif
 if has('syntax')
     syntax enable
 
+" Don't highlight more than 200 columns as I normally don't have that long
+" lines and they slow down syntax coloring. Thanks to Derek Wyatt
+" (http://www.derekwyatt.org/vim/the-vimrc-file/).
+    set synmaxcol=200
+
 " Highlight lines longer than 78 characters. Thanks to Tony Mechelynck
 " <antoine.mechelynck@gmail.com> from the Vim mailing list. It can easily be
 " disabled when necessary with :2match (in Vim >= 700).