X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.vimrc;h=8f1041afb56b5346958616ca75abe8662affdc78;hb=f74cdd5fbf0ead8d188607abce07297a9e352460;hp=78e57b827b29c840200963a2d39c656c206324b0;hpb=efaf5d80df0911f4c258cfeb1b33beb6fe710d0f;p=dotfiles.git

diff --git a/.vimrc b/.vimrc
index 78e57b8..8f1041a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -71,6 +71,10 @@ set ttyfast       " terminal connection is fast
 
 set title         " Set title to the value of 'titlestring' or to 'filename - VIM'
 set titleold=     " string to restore the title to when exiting Vim
+" String to use for the Vim window title; with statusline printf items:
+" display filename, modification flag, full path, argument list status,
+" the current user, host and program name (to distinguish vim/view/etc).
+set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:p:h\")})%)%(\ %a%)\ -\ [%{$USER}@%{hostname()}]\ %{v:progname}
 
 " 9 using the mouse
 
@@ -111,13 +115,26 @@ set noautoindent  " Do not automatically set the indent of a new line
 
 " 18 mapping
 
-set timeout timeoutlen=3000 " allow timing out up to 3 seconds halfway into a mapping
+set timeout timeoutlen=3000 ttimeoutlen=100 " allow timing out up to 3 seconds halfway into a mapping; 100 ms to wait for a key code or mapped key sequence to complete
 
 " 19 reading and writing files
 if v:version >= 703
    set cryptmethod=blowfish " encryption method for file writing: zip or blowfish
 endif
 
+" 20 the swap file
+
+" list of directories for the swap file; remove . (the current directory)
+if has("win32")
+   set directory=$TEMP//,c:/tmp//,c:/temp//
+else
+   set directory=~/tmp//,/var/tmp//,/tmp//
+endif
+" if a directory ends in two path separators "//"
+" or "\\", the swap file name will be built from the complete path to
+" the file with all path separators substituted to percent '%' signs.
+" This will ensure file name uniqueness in the preserve directory.
+
 " 21 command line editing
 
 set history=1000  " how many command lines are remembered
@@ -243,7 +260,7 @@ else
    endif
 
    if (&term =~ "screen")
-      set ttymouse=xterm " Enable mouse codes under GNU screen
+      set ttymouse=xterm2 " Enable mouse codes under screen/tmux
       if empty(&t_ts)
          " Enable window title under screen/tmux
          let &t_ts = "\e]2;"
@@ -267,6 +284,8 @@ nmap \ss :syntax sync fromstart<Enter>
 " Enable filetype detection
 filetype plugin indent on
 
+runtime macros/matchit.vim
+
 " Reread me after editing
 autocmd BufWritePost ~/.vimrc source ~/.vimrc | syntax on