X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=188697127217e2eddf34bd5831b2ae72c049b861;hp=ce3b0ca21bd1068c70253deb6d6cd5a438c49d52;hb=a35e8ca463e14772e3634291187553567bdc77f1;hpb=49a954bd748f27f80c92fd0843ed9e0029d53709

diff --git a/.vimrc b/.vimrc
index ce3b0ca..1886971 100644
--- a/.vimrc
+++ b/.vimrc
@@ -2,16 +2,16 @@
 " Multi-version vimrc compatible with version 4 and above.   vim:set fdm=marker:
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-" Note that "if <condition> | call Something() | endif" syntax is unsupported 
-" in Vim 4 so we write all our functions out the long way.  It does work in 
+" Note that "if <condition> | call Something() | endif" syntax is unsupported
+" in Vim 4 so we write all our functions out the long way.  It does work in
 " autocommand definitions, however.
 
 " Vim 4 complains if version isn't set in the configuration file.
 version 4.0
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Handle options safe to use in version 4.  Vim 4 parses but ignores the 
-" "if version" syntax used later in this file so we don't use it.  No attempt 
+" Handle options safe to use in version 4.  Vim 4 parses but ignores the
+" "if version" syntax used later in this file so we don't use it.  No attempt
 " is made to make this configuration compatible with Vim 3.
 " Some of these settings should strictly be wrapped inside "if has()" blocks
 " but that would cause them not to be ignored by Vim 4.
@@ -75,6 +75,10 @@ inoremap <C-l> <C-n><C-p>
 " Swap jump keys.
 noremap ' `
 noremap ` '
+
+" Select previous widnow.
+noremap <C-w>^ <C-w>p
+noremap <C-w><C-^> <C-w>p
 "}}}1
 
 " Find stuff.
@@ -320,7 +324,7 @@ endfun "}}}2
 " Set extra columns depending on window status.
 fun! Extra_Columns(extra, var, ...) "{{{2
   " Vim 6 doesn't have winnr("$").  Determine which windows are open
-  " ourselves by using :windo to incremement a counter.  As Vim 5 
+  " ourselves by using :windo to incremement a counter.  As Vim 5
   " doesn't have :windo we require Vim 6 for this.
   if v:version < "600"
     return ""
@@ -617,6 +621,9 @@ version 5.4
 " Reuse windows when using sbuffer.
 se switchbuf=useopen
 
+" Allow persistent variable saving for localvimrc.
+se viminfo+=!
+
 " Do we have Unicode?
 fun! Has_Unicode() "{{{2
   if ! has('multi_byte')
@@ -1234,7 +1241,7 @@ map gb :tabprevious<CR>:<CR>
 " Transparency.
 if has("gui_macvim")
   se transparency=15
-endif 
+endif
 
 " Yet more GUI options.  Add tabs.
 if has("gui")
@@ -1253,6 +1260,9 @@ let g:bufExplorerSplitOutPathName=0
 let g:NERDSpaceDelims=1
 endif "}}}1
 
+" localvimrc.
+let g:localvimrc_persistent=1
+
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Handle options only available in Vim 7.2 and above.
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""