X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=4c5f852c15f3f20d40a662f533f53225dec96db6;hb=be514bc4c2d011f8e89136fa3ea5299338d1f4fc;hp=7d1f0aef93967db3d0904d25770e50477755116d;hpb=63c87697a4eafe134ae1196021afd8441c6b4e33;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 7d1f0ae..4c5f852 100644
--- a/vimrc
+++ b/vimrc
@@ -34,14 +34,23 @@ set runtimepath^=~/.vim,~/.vim/runtime
 
 " Don't store swap files in the same directory as the edited file.
 set directory-=.
+" But store them in ~/.tmp if available.
+set directory^=~/.tmp
 
 " Disable modelines as they may cause security problems. Instead use
 " securemodelines (Vim script #1876).
 set nomodeline
 
-" When completing paths first use the longest path then display a list of all
-" possible files.
-set wildmode=longest,list
+" Complete to longest common string (list:longest) and then complete all full
+" matches after another (full). Thanks to pbrisbin
+" (http://pbrisbin.com:8080/dotfiles/vimrc).
+set wildmode=list:longest,full
+
+" Increase history of executed commands (:).
+set history=1000
+
+" Increase number of possible undos.
+set undolevels=1000
 
 " Use strong encryption if possible, also used for swap/undo files.
 if v:version >= 703
@@ -53,6 +62,7 @@ endif
 
 " Enable automatic file detection, plugin and indention support.
 if has('autocmd')
+    filetype off " necessary for pathogen to force a reload of ftplugins
     filetype plugin indent on
 endif
 
@@ -172,6 +182,7 @@ if has('statusline')
 
     " on the right
     set statusline+=%=                " right align
+    set statusline+=0x%-8B\           " current character under cursor as hex
     set statusline+=%-12.(%l,%c%V%)\  " line number (%l),
                                       " column number (%c),
                                       " virtual column number if different
@@ -184,9 +195,11 @@ endif
 
 " Easy way to exit insert mode.
 inoremap jj <Esc>
+inoremap jk <Esc>
 " Also for command mode, thanks to http://github.com/mitechie/pyvim
 " (2010-10-15).
 cnoremap jj <C-C>
+cnoremap jk <C-C>
 
 " Disable arrow keys for all modes except command modes. Thanks to James Vega
 " (http://git.jamessan.com/?p=etc/vim.git;a=summary).
@@ -308,6 +321,17 @@ if has('gui_macvim') && has('eval')
     let macvim_skip_cmd_opt_movement = 1
 endif
 
+" In case 'hlsearch' is used disable it with <C-L>. Thanks to frogonwheels and
+" vimgor (bot) in #vim on Freenode (2010-03-30 05:58 CEST).
+noremap <silent> <C-L> :nohlsearch<CR><C-L>
+
+
+" ABBREVIATIONS
+
+" Fix some of my spelling mistakes.
+iabbrev relle reelle
+iabbrev reele reelle
+
 
 " SYNTAX SETTINGS
 
@@ -338,6 +362,13 @@ endif
 
 " PLUGIN SETTINGS
 
+" Use pathogen which allows one 'runtimepath' entry per plugin. This makes
+" installing/removing/updating plugins simple. (Used for plugins with more
+" than one file.)
+if has('eval')
+    call pathogen#runtime_append_all_bundles()
+endif
+
 " Settings for the NERD commenter.
 " Don't create any mappings I don't want to use.
 if has('eval')