X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=83996b31ea19d478b837455cce4dc4ea3d6eae25;hb=037f9763a1d4a6e82fb78e4a29ddc722d2bd0f92;hp=1dfc91956094d9af1abefc371e1a5e02c5cb44e5;hpb=874a5ebdc7dcd3608bbdcf15a1f891dbc62303c7;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 1dfc919..83996b3 100644
--- a/vimrc
+++ b/vimrc
@@ -34,6 +34,8 @@ 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).
@@ -60,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
 
@@ -192,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).
@@ -218,15 +223,18 @@ cmap <Left>  <Nop>
 cnoremap <C-P> <Up>
 cnoremap <C-N> <Down>
 
+" Write before suspending, thanks to deryni in #vim on Freenode (2011-05-09
+" 20:02 CEST). To suspend without saving either unmap it or use :stop<CR>.
+nnoremap <C-Z> :update<CR>:stop<CR>
+
+" 2<C-G> gives more verbose information, use it by default. Thanks to NCS_One
+" in #vim on Freenode (2011-08-15 00:17 CEST).
+nnoremap <C-G> 2<C-G>
+
 " Use <Space> to move down a page and - to move up one like in mutt.
 nnoremap <Space> <C-F>
 nnoremap - <C-B>
 
-" Behave like 'scrolloff' but only while searching. Thanks to "Benjamin R.
-" Haskell" <vim@benizi.com> from the Vim mailing list (2010-10-26).
-nnoremap n nzv3j3k
-nnoremap N Nzv3k3j
-
 " Go to next and previous buffer. Thanks to elik in #vim on Freenode
 " (2010-05-16 18:38 CEST) for this idea.
 nnoremap <silent> gb :bnext<CR>
@@ -316,6 +324,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
 
@@ -341,11 +360,27 @@ if has('syntax')
     if v:version > 701 || (v:version == 701 && has('patch42'))
         call matchadd('Todo', '\(TODO\|FIXME\|CHANGED\|XXX\)')
     endif
+
+" Settings for specific filetypes.
+
+    " Perl.
+    let g:perl_fold = 1
+    let g:perl_fold_blocks = 1
+    let g:perl_nofold_packages = 1
+    let g:perl_include_pod = 1 " syntax coloring for PODs
+
 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')
@@ -413,9 +448,6 @@ if has('autocmd')
 " the recommendation for git commit messages (http://tpope.net/node/106).
         autocmd FileType gitcommit let g:secure_modelines_allowed_items = [] |
                                  \ setlocal textwidth=72
-" Allow folding in perl.
-        autocmd FileType perl let perl_fold = 1 |
-                            \ let perl_fold_blocks = 1
 " Use the same comment string as for Vim files in Vimperator files.
         autocmd FileType vimperator setlocal commentstring=\"%s