X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.vimrc;h=78e57b827b29c840200963a2d39c656c206324b0;hb=ebc414ff2cbb3e63e8052ec4e5cd34cf0d7cfd33;hp=0f51857368e923e6984d869de6108727af0efcc3;hpb=9f600768a235bc0f4c2fe1e2e76582baec921130;p=dotfiles.git

diff --git a/.vimrc b/.vimrc
index 0f51857..78e57b8 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")
@@ -274,14 +281,14 @@ autocmd BufReadPost * syntax on
 
 " Restore last known cursor position
 function! RestorePosition()
-   if exists('b:position_resored')
+   if exists('b:position_restored')
       return
    endif
 
    if line("'\"") > 0
       call cursor(line("'\""), col("'\""))
    endif
-   let b:position_resored = 1
+   let b:position_restored = 1
 endfunction
 
 " When editing a file, always jump to the last cursor position (if saved)
@@ -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
 
 
@@ -471,7 +476,7 @@ if version >= 700
 function! W()
    " let encodings=filter(split(&fileencodings, ','), 'v:val != "ucs-bom"')
    let encodings = ['us-ascii']
-   if $LC_CTYPE == 'ru_RU.UTF-8'
+   if $LC_CTYPE =~ 'UTF-8' " UTF-8 or en_US.UTF-8 or ru_RU.UTF-8 or such
       let encodings += ['utf-8']
    elseif $LC_CTYPE == 'ru_RU.KOI8-R'
       let encodings += ['koi8-r', 'utf-8']
@@ -563,19 +568,21 @@ endif
 
 
 " Called automagically after every buffer read, enables fileencoding
-" setting from modeline (see Tip #911)
+" setting from modeline (see Tip #911: http://vim.wikia.com/wiki/VimTip911)
 function! AutoEncoding()
-  if exists("b:justloaded")
-    unlet b:justloaded
-    if &modified && &fileencoding != ""
-      call SetupEncoding(&fileencoding)
-    endif
+  if &modified && &fileencoding != ""
+    call SetupEncoding(&fileencoding)
+  else
+    redraw
   endif
+  autocmd! auto-encoding
+  augroup! auto-encoding
 endfunction
 
-" Magic autocommands installed here
-autocmd BufReadPost * let b:justloaded = 1
+augroup auto-encoding
+autocmd!
 autocmd BufWinEnter * call AutoEncoding()
+augroup END
 
 
 let CONVERT=1
@@ -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