X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.vimrc;h=7bb96e27e7398e5b2ebf9ac7c63e4b2b12331c42;hp=41d0e220f5ca14682d5a2dd2ba6607e788f70c9d;hb=5080a18901c90727c7dd11cc43bdefbad53f42c7;hpb=01750040116e8b50ca033c9b44348027a8edba5b

diff --git a/.vimrc b/.vimrc
index 41d0e22..7bb96e2 100644
--- a/.vimrc
+++ b/.vimrc
@@ -47,7 +47,11 @@ set whichwrap=b,s,h,l,<,>,[,],~ " Wrap to the previous/next line on all keys and
 " 4 displaying text
 
 set display=lastline,uhex " Show the last line instead of '@'; show non-printable chars as <hex>
-set lazyredraw    " Do not update screen while executing macros
+
+" Do not set it here, it breaks initial screen drawing and cursor positioning.
+" See SetLazyRedraw at the end of the script.
+" set lazyredraw  " Do not update screen while executing macros
+
 set list          " listchars only works with 'list'
 " Show tabs, non-breaking/trailing spaces, long lines
 set listchars=tab:>_,nbsp:_,trail:_,extends:+,precedes:+
@@ -215,6 +219,8 @@ if has("gui_running")
       set toolbar=icons,text " how to show the toolbar
    endif
 
+   set guicursor+=n:block " Block cursor in normal mode
+   set guicursor+=i:ver10 " Solid vertical bar in insert mode
    set guicursor+=a:blinkon0 " Stop cursor blinking
 
    " Make shift-insert work like in Xterm
@@ -233,7 +239,8 @@ if has("gui_running")
    " ----------
 
 else
-   if (&term =~ "linux") || ($BACKGROUND == 'DARK') || ($BACKGROUND == 'dark')
+   if (&term =~ "linux") || (&term =~ "cygwin") || (&term =~ "putty")
+         \ || ($BACKGROUND == 'DARK') || ($BACKGROUND == 'dark')
          \ || has("win32")
       " Background of the terminal is black or dark grey
       set background=dark
@@ -299,21 +306,31 @@ else
    cmap <f29> <nop>
 
    "https://coderwall.com/p/if9mda/automatically-set-paste-mode-in-vim-when-pasting-in-insert-mode
-   function! WrapForTmux(s)
-     if !exists('$TMUX')
-       return a:s
-     endif
+   " https://ttssh2.osdn.jp/manual/en/usage/tips/vim.html
+   function! WrapForScreenTmux(s)
+      if (&term =~ "screen")
+         let scr_start = "\<Esc>P"
+         let scr_end = "\<Esc>\\"
+
+         return scr_start . a:s . scr_end
+      endif
 
-     let tmux_start = "\<Esc>Ptmux;"
-     let tmux_end = "\<Esc>\\"
+      if exists('$TMUX')
+         let tmux_start = "\<Esc>Ptmux;"
+         let tmux_end = "\<Esc>\\"
 
-     return tmux_start . substitute(a:s, "\<Esc>", "\<Esc>\<Esc>", 'g') . tmux_end
+         return tmux_start . substitute(a:s, "\<Esc>", "\<Esc>\<Esc>", 'g') . tmux_end
+      endif
+
+      return a:s
    endfunction
 
    " https://vim.fandom.com/wiki/Change_cursor_shape_in_different_modes
-   let &t_EI.=WrapForTmux("\e[2 q") "EI = NORMAL mode (ELSE)
-   let &t_SI.=WrapForTmux("\e[6 q") "SI = INSERT mode
-   let &t_SR.=WrapForTmux("\e[4 q") "SR = REPLACE mode
+   let &t_EI.=WrapForScreenTmux("\e[2 q") "EI = NORMAL mode (ELSE)
+   let &t_SI.=WrapForScreenTmux("\e[6 q") "SI = INSERT mode
+   if v:version >= 800
+      let &t_SR.=WrapForScreenTmux("\e[4 q") "SR = REPLACE mode
+   endif
 
    "Cursor settings:
    "  1 -> blinking block
@@ -369,13 +386,13 @@ autocmd BufReadPost * call RestorePosition()
 
 
 function! SetupEncoding(encoding)
-   if !has("iconv") || exists('b:encoding_set') || strlen(a:encoding) == 0
+   if !has("iconv") || exists('b:encoding_set') || empty(a:encoding)
       return
    endif
 
    call RestorePosition()
    let b:encoding_set = 1
-   if len(expand('%'))
+   if !empty(expand('%'))
       execute "edit ++enc=" . a:encoding
    endif
 endfunction
@@ -441,7 +458,7 @@ function! ExtractURL()
    let line = getline('.')
    let parts = split(line, s:URL_re . '\zs')
 
-   if len(parts) == 0
+   if empty(parts)
       throw 'ExtractURLCannotFindURL' " No URL found
    endif
 
@@ -696,8 +713,6 @@ command! Text call Text()
 function! AutoEncoding()
   if &modified && &fileencoding != ""
     call SetupEncoding(&fileencoding)
-  else
-    redraw
   endif
   autocmd! auto-encoding
   augroup! auto-encoding
@@ -762,6 +777,15 @@ if has("spell")
       endif
    endfunction
    autocmd BufReadPost * call SetupSpell()
+
+   function! SaveSpell()
+      if expand('%:p') == expand('~/.vim/spell/en.ascii.add')
+         mkspell! -ascii %
+      else
+         mkspell! %
+      endif
+   endfunction
+   autocmd BufWritePost ~/.vim/spell/*.add call SaveSpell()
 endif
 
 
@@ -815,5 +839,13 @@ command! UName Uname
 endif
 " ----------
 
+if v:version >= 800
+   function! SetLazyRedraw(timer_id)
+      call timer_stop(a:timer_id) " One-time event
+      set lazyredraw
+   endfunction
+   call timer_start(500, 'SetLazyRedraw')
+endif
+
 " 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