X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.vimrc;h=de5a2583e4e63f5c65803fa389624745d11d1491;hp=8e8884172805f4014f01f25446dc241e559543b5;hb=9a7de6d0809593857e5e8cf1383ed58e0f52ef4e;hpb=096bb648471cb26e48e5c59911f52b6e436464a3

diff --git a/.vimrc b/.vimrc
index 8e88841..de5a258 100644
--- a/.vimrc
+++ b/.vimrc
@@ -99,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;
@@ -214,8 +218,8 @@ 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 toolbar=icons,text " how to show the toolbar
    endif
 
@@ -264,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;
@@ -386,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
@@ -458,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
 
@@ -713,8 +737,6 @@ command! Text call Text()
 function! AutoEncoding()
   if &modified && &fileencoding != ""
     call SetupEncoding(&fileencoding)
-  else
-    redraw
   endif
   autocmd! auto-encoding
   augroup! auto-encoding
@@ -781,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! %