X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vimrc;h=28d060ed1c8c119280a136b53cb2a9e42421edd9;hb=fc8569b09fbdd15940d09c154e6d7795c5e10294;hp=45d56e3702c04bcf7cc3925ac1765fe0dd066eec;hpb=c396d112edafe6f3044fe08f6abe147596abbc68;p=profile.git

diff --git a/.vimrc b/.vimrc
index 45d56e3..28d060e 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 ""
@@ -614,6 +618,9 @@ endif "}}}1
 if version >= "504" "{{{1
 version 5.4
 
+" Reuse windows when using sbuffer.
+se switchbuf=useopen
+
 " Do we have Unicode?
 fun! Has_Unicode() "{{{2
   if ! has('multi_byte')
@@ -1231,7 +1238,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")