.vimrc: Improve GUI type detection

[dotfiles.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 39ca62d8bace29996bcb3dfe95aab026ab8658be..de5a2583e4e63f5c65803fa389624745d11d1491 100644 (file)
--- 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;
@@ -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