X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.vimrc;h=83458ed39c76bae0a98b6eddf257d497e61ee052;hp=4bb96bc4ba1914ff8461dd3f50d67f58d5a8911d;hb=5d48cf52db5f95f5685c69cef59e92504c16841f;hpb=2703a700a207a3a7b7c8326aaae312285c26bf87

diff --git a/.vimrc b/.vimrc
index 4bb96bc..83458ed 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:+
@@ -95,6 +99,10 @@ endif
 
 set ruler         " Show cursor position below each window
 set showcmd       " Show (partial) command keys in the status line
+set visualbell    " Use visual bell instead of beeping
+if v:version >= 800
+   set belloff=error,insertmode " Do not ring the bell for these reasons
+endif
 
 " Short message for [Modified];
 " overwrite message for writing a file with subsequent message;
@@ -210,11 +218,13 @@ if has("gui_running")
    if has("win32")
       "set guifont=Courier_New:h18:cRUSSIAN
       set guifont=Lucida_Console:h18:cRUSSIAN
-   else
-      set guifont=Monospace\ 16
+   elseif has("x11")
+      set guifont=Monospace\ 18
       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 +243,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
@@ -257,6 +268,26 @@ else
          set t_Sb="\e[4%dm"
       endif
 
+      " KP_Up -> Up
+      map <Esc>Ox <Esc>OA
+      map! <Esc>Ox <Esc>OA
+      " KP_Down -> Down
+      map <Esc>Or <Esc>OB
+      map! <Esc>Or <Esc>OB
+      " KP_Right -> Right
+      map <Esc>Ov <Esc>OC
+      map! <Esc>Ov <Esc>OC
+      " KP_Left -> Left
+      map <Esc>Ot <Esc>OD
+      map! <Esc>Ot <Esc>OD
+      " KP_Home -> Home
+      map <Esc>Ow <Esc>[7~
+      map! <Esc>Ow <Esc>[7~
+      " KP_End -> End
+      map <Esc>Oq <Esc>[8~
+      map! <Esc>Oq <Esc>[8~
+      " KP_Prev (PgDn) and KP_Next (PgUp) work fine, no mapping is required
+
       " 'autoselect' to always put selected text on the clipboard;
       " 'unnamed' to use the * register like unnamed register '*'
       " for all yank, delete and put operations;
@@ -379,13 +410,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
@@ -451,7 +482,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
 
@@ -706,8 +737,6 @@ command! Text call Text()
 function! AutoEncoding()
   if &modified && &fileencoding != ""
     call SetupEncoding(&fileencoding)
-  else
-    redraw
   endif
   autocmd! auto-encoding
   augroup! auto-encoding
@@ -774,7 +803,7 @@ if has("spell")
    autocmd BufReadPost * call SetupSpell()
 
    function! SaveSpell()
-      if expand('%') == expand('~/.vim/spell/en.ascii.add')
+      if expand('%:p') == expand('~/.vim/spell/en.ascii.add')
          mkspell! -ascii %
       else
          mkspell! %
@@ -834,5 +863,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