X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.vimrc;h=f3d60e5d986f3e16d3eec60df80ec229fc884e9c;hb=6bf46a8c8b9fdcc6162f904d3f318e3500212686;hp=422f97d48a1acfa55a5dbdd59fe646989f6be162;hpb=e0b3af196fc0530f97b34473ea48fa623c7be1ee;p=dotfiles.git

diff --git a/.vimrc b/.vimrc
index 422f97d..f3d60e5 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
 
@@ -113,6 +117,24 @@ set noautoindent  " Do not automatically set the indent of a new line
 
 set timeout timeoutlen=3000 " allow timing out up to 3 seconds halfway into a mapping
 
+" 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
@@ -204,15 +226,17 @@ else
          \ || has("win32")
       " Background of the terminal is black or dark grey
       set background=dark
+      highlight MoreMsg ctermfg=white
+      highlight ModeMsg ctermfg=white
+      highlight Question ctermfg=white
    else
       set background=light
+      highlight MoreMsg cterm=bold ctermfg=NONE
+      highlight Question cterm=bold ctermfg=NONE
    endif
 
    if (&term =~ "linux")
       execute 'set t_kb=' . nr2char(127)
-   else
-      highlight MoreMsg cterm=bold ctermfg=NONE
-      highlight Question cterm=bold ctermfg=NONE
    endif
 
    if (&term =~ "rxvt") || (&term =~ "screen") || (&term =~ "term") || (&term =~ "vt100")
@@ -236,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;"
@@ -260,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