tmux 1.8 changed how run-shell works.

[profile.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 18e34fa..65e88b3 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -76,12 +76,12 @@ inoremap <C-b> <C-p>
 inoremap <C-l> <C-n><C-p>
 
 " Swap jump keys.
-noremap ' `
-noremap ` '
+nnoremap ' `
+nnoremap ` '
 
 " Select previous widnow.
-noremap <C-w>^ <C-w>p
-noremap <C-w><C-^> <C-w>p
+nnoremap <C-w>^ <C-w>p
+nnoremap <C-w><C-^> <C-w>p
 "}}}1
 
 " Find stuff.
@@ -796,7 +796,7 @@ endif "}}}1
 if version >= "600" "{{{1
 version 6.0
 
-if has("gui_win32")
+if has("win32") || has("win64")
   se encoding=utf-8
 endif
 
@@ -810,7 +810,14 @@ filetype indent on
 
 " Less intrusive syntax highlighting.
 if has("syntax")
-  syn enable
+  " The :syntax enable command tries to source the syntax.vim runtime script.
+  " Parsing this .vimrc will fail if for some reason the runtime doesn't
+  " exist, as could be the case if the binary was installed with no support
+  " files.  GNU On Windows is one example of an incomplete installation.
+  try
+    syn enable
+  catch
+  endtry
 endif
 
 " Set colours.
@@ -1332,6 +1339,9 @@ call Mapping("u", ":call <SID>Cycle_Undo()<CR>:<CR>")
 " Remove persistent undo file with \U.
 call Mapping("U", ":call <SID>Clear_Undo()<CR>:<CR>")
 
+" Toggle gundo window with \g.
+call Mapping("g", ":call gundo#GundoToggle()<CR>:<CR>")
+
 " Use a persistent undo file if it exists.
 fun! <SID>Check_Undo() "{{{2
   if filereadable(undofile(expand("%")))
@@ -1407,6 +1417,12 @@ if has("autocmd")
     au Display WinEnter * if &diff | se cursorbind | endif
   endif
 endif
+
+" Mapping to reload the gundo window.
+if has("autocmd")
+  au Mode BufEnter * if &ft == "gundo" | try | nnoremap <silent> <buffer> <unique> r :call gundo#GundoToggle()<CR>:call gundo#GundoToggle()<CR> | catch | endtry | endif
+endif
+
 endif "}}}1
 
 " Resize after startup.