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

diff --git a/vimrc b/vimrc
index 322bc9a..4c5f852 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).
@@ -321,6 +326,13 @@ endif
 noremap <silent> <C-L> :nohlsearch<CR><C-L>
 
 
+" ABBREVIATIONS
+
+" Fix some of my spelling mistakes.
+iabbrev relle reelle
+iabbrev reele reelle
+
+
 " SYNTAX SETTINGS
 
 " Activate syntax coloring.
@@ -350,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')