X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.vimrc;h=9dd4900f4fdd72b0b1122e84a9c0b3c5b638c073;hb=5986113e20ff051164b66cf7c198a486c3b9cd55;hp=063844d36d6e2c5d1a9dea46366921f310cee413;hpb=6aba48a19496344bd89039cc6f2a53a339377729;p=dotfiles.git

diff --git a/.vimrc b/.vimrc
index 063844d..9dd4900 100644
--- a/.vimrc
+++ b/.vimrc
@@ -113,6 +113,11 @@ 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
+
 " 21 command line editing
 
 set history=1000  " how many command lines are remembered
@@ -204,15 +209,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 +243,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;"
@@ -289,15 +296,13 @@ autocmd BufReadPost * call RestorePosition()
 
 
 function! SetupEncoding(encoding)
-   if !has("iconv") || exists('b:encoding_set')
+   if !has("iconv") || exists('b:encoding_set') || strlen(a:encoding) == 0
       return
    endif
 
-   if strlen(a:encoding) > 0
-      call RestorePosition()
-      let b:encoding_set = 1
-      execute "edit ++enc=" . a:encoding
-   endif
+   call RestorePosition()
+   let b:encoding_set = 1
+   execute "edit ++enc=" . a:encoding
 endfunction
 
 
@@ -567,6 +572,8 @@ endif
 function! AutoEncoding()
   if &modified && &fileencoding != ""
     call SetupEncoding(&fileencoding)
+  else
+    redraw
   endif
   autocmd! auto-encoding
   augroup! auto-encoding
@@ -725,14 +732,5 @@ command! UName call Uname()
 endif
 " ----------
 
-augroup redraw-once
-autocmd!
-" Redraw screen after all macros in ~/.vimrc and ~/.vim/
-autocmd BufReadPost * redraw
-" Remove the redraw autocommand (it's only needed once) and the autgroup
-autocmd BufReadPost * autocmd! redraw-once
-autocmd BufReadPost * augroup! redraw-once
-augroup END
-
 " This has to go to the very end of ~/.vimrc to allow reading the .vimrc
 set secure        " safer working with script files in the current directory