Further tweakings.

2 files changed, 49 insertions, 43 deletions

diff --git a/vim/colors/sahara.vim b/vim/colors/sahara.vim
index 8aa9032d..a3eddad2 100644
--- a/vim/colors/sahara.vim
+++ b/vim/colors/sahara.vim
@@ -15,40 +15,40 @@ if version > 580
         syntax reset
     endif
 endif
-let g:colors_name="dessert"
+let g:colors_name="sahara"
 
 "
 " Highlighting definitions.
 "
 if has("gui_running") || &t_Co == 256
-    highlight Comment      cterm=NONE ctermfg=110 ctermbg=16  gui=NONE guifg=#87afd7 guibg=#000000
-    highlight Constant     cterm=NONE ctermfg=217 ctermbg=16  gui=NONE guifg=#ffafaf guibg=#000000
-    highlight Cursor       cterm=NONE ctermfg=66  ctermbg=222 gui=NONE guifg=#5f8787 guibg=#ffd787
-    highlight FoldColumn   cterm=NONE ctermfg=180 ctermbg=237 gui=NONE guifg=#d7af87 guibg=#3a3a3a
-    highlight Folded       cterm=NONE ctermfg=220 ctermbg=237 gui=NONE guifg=#ffd700 guibg=#3a3a3a
-    highlight Identifier   cterm=NONE ctermfg=120 ctermbg=16  gui=NONE guifg=#87ff87 guibg=#000000
-    highlight Ignore       cterm=NONE ctermfg=240 ctermbg=16  gui=NONE guifg=#585858 guibg=#000000
-    highlight IncSearch    cterm=NONE ctermfg=147 ctermbg=24  gui=NONE guifg=#afafff guibg=#005f87
-    highlight ModeMsg      cterm=NONE ctermfg=178 ctermbg=16  gui=NONE guifg=#d7af00 guibg=#000000
-    highlight MoreMsg      cterm=NONE ctermfg=29  ctermbg=16  gui=NONE guifg=#00875f guibg=#000000
-    highlight NonText      cterm=NONE ctermfg=237 ctermbg=16  gui=NONE guifg=#3a3a3a guibg=#000000
-    highlight Normal       cterm=NONE ctermfg=251 ctermbg=16  gui=NONE guifg=#c6c6c6 guibg=#000000
-    highlight Pmenu        cterm=NONE ctermfg=231 ctermbg=237 gui=NONE guifg=#ffffff guibg=#3a3a3a
-    highlight PreProc      cterm=NONE ctermfg=167 ctermbg=16  gui=NONE guifg=#d75f5f guibg=#000000
-    highlight Question     cterm=NONE ctermfg=48  ctermbg=16  gui=NONE guifg=#00ff87 guibg=#000000
-    highlight Search       cterm=NONE ctermfg=147 ctermbg=17  gui=NONE guifg=#afafff guibg=#000087
-    highlight Special      cterm=NONE ctermfg=223 ctermbg=16  gui=NONE guifg=#ffd7af guibg=#000000
-    highlight SpecialKey   cterm=NONE ctermfg=112 ctermbg=16  gui=NONE guifg=#87d700 guibg=#000000
-    highlight Statement    cterm=NONE ctermfg=222 ctermbg=16  gui=NONE guifg=#ffd787 guibg=#000000
-    highlight StatusLine   cterm=NONE ctermfg=231 ctermbg=237 gui=NONE guifg=#ffffff guibg=#3a3a3a
-    highlight StatusLineNC cterm=NONE ctermfg=16  ctermbg=237 gui=NONE guifg=#000000 guibg=#3a3a3a
-    highlight Title        cterm=NONE ctermfg=244 ctermbg=237 gui=NONE guifg=#808080 guibg=#3a3a3a
-    highlight Todo         cterm=NONE ctermfg=196 ctermbg=226 gui=NONE guifg=#ff0000 guibg=#ffff00
-    highlight Type         cterm=NONE ctermfg=143 ctermbg=16  gui=NONE guifg=#afaf5f guibg=#000000
-    highlight Underlined   cterm=NONE ctermfg=81  ctermbg=16  gui=NONE guifg=#5fd7ff guibg=#000000
-    highlight VertSplit    cterm=NONE ctermfg=243 ctermbg=237 gui=NONE guifg=#767676 guibg=#3a3a3a
-    highlight Visual       cterm=NONE ctermfg=222 ctermbg=64  gui=NONE guifg=#ffd787 guibg=#5f8700
-    highlight WarningMsg   cterm=NONE ctermfg=209 ctermbg=16  gui=NONE guifg=#ff875f guibg=#000000
+    highlight Comment      term=NONE cterm=NONE ctermfg=110 ctermbg=NONE gui=NONE guifg=#87afd7 guibg=NONE
+    highlight Constant     term=NONE cterm=NONE ctermfg=217 ctermbg=NONE gui=NONE guifg=#ffafaf guibg=NONE
+    highlight Cursor       term=NONE cterm=NONE ctermfg=66  ctermbg=222  gui=NONE guifg=#5f8787 guibg=#ffd787
+    highlight FoldColumn   term=NONE cterm=NONE ctermfg=180 ctermbg=237  gui=NONE guifg=#d7af87 guibg=#3a3a3a
+    highlight Folded       term=NONE cterm=NONE ctermfg=220 ctermbg=237  gui=NONE guifg=#ffd700 guibg=#3a3a3a
+    highlight Identifier   term=NONE cterm=NONE ctermfg=120 ctermbg=NONE gui=NONE guifg=#87ff87 guibg=NONE
+    highlight Ignore       term=NONE cterm=NONE ctermfg=240 ctermbg=NONE gui=NONE guifg=#585858 guibg=NONE
+    highlight IncSearch    term=NONE cterm=NONE ctermfg=147 ctermbg=24   gui=NONE guifg=#afafff guibg=#005f87
+    highlight ModeMsg      term=NONE cterm=NONE ctermfg=178 ctermbg=NONE gui=NONE guifg=#d7af00 guibg=NONE
+    highlight MoreMsg      term=NONE cterm=NONE ctermfg=29  ctermbg=NONE gui=NONE guifg=#00875f guibg=NONE
+    highlight NonText      term=NONE cterm=NONE ctermfg=237 ctermbg=NONE gui=NONE guifg=#3a3a3a guibg=NONE
+    highlight Normal       term=NONE cterm=NONE ctermfg=251 ctermbg=NONE gui=NONE guifg=#c6c6c6 guibg=NONE
+    highlight Pmenu        term=NONE cterm=NONE ctermfg=231 ctermbg=237  gui=NONE guifg=#ffffff guibg=#3a3a3a
+    highlight PreProc      term=NONE cterm=NONE ctermfg=167 ctermbg=NONE gui=NONE guifg=#d75f5f guibg=NONE
+    highlight Question     term=NONE cterm=NONE ctermfg=48  ctermbg=NONE gui=NONE guifg=#00ff87 guibg=NONE
+    highlight Search       term=NONE cterm=NONE ctermfg=147 ctermbg=18   gui=NONE guifg=#afafff guibg=#000087
+    highlight Special      term=NONE cterm=NONE ctermfg=223 ctermbg=NONE gui=NONE guifg=#ffd7af guibg=NONE
+    highlight SpecialKey   term=NONE cterm=NONE ctermfg=112 ctermbg=NONE gui=NONE guifg=#87d700 guibg=NONE
+    highlight Statement    term=NONE cterm=NONE ctermfg=222 ctermbg=NONE gui=NONE guifg=#ffd787 guibg=NONE
+    highlight StatusLine   term=NONE cterm=NONE ctermfg=231 ctermbg=237  gui=NONE guifg=#ffffff guibg=#3a3a3a
+    highlight StatusLineNC term=NONE cterm=NONE ctermfg=16  ctermbg=237  gui=NONE guifg=#000000 guibg=#3a3a3a
+    highlight Todo         term=NONE cterm=NONE ctermfg=196 ctermbg=226  gui=NONE guifg=#ff0000 guibg=#ffff00
+    highlight Type         term=NONE cterm=NONE ctermfg=143 ctermbg=NONE gui=NONE guifg=#afaf5f guibg=NONE
+    highlight Underlined   term=NONE cterm=NONE ctermfg=81  ctermbg=NONE gui=NONE guifg=#5fd7ff guibg=NONE
+    highlight VertSplit    term=NONE cterm=NONE ctermfg=243 ctermbg=237  gui=NONE guifg=#767676 guibg=#3a3a3a
+    highlight Visual       term=NONE cterm=NONE ctermfg=222 ctermbg=64   gui=NONE guifg=#ffd787 guibg=#5f8700
+    highlight WarningMsg   term=NONE cterm=NONE ctermfg=209 ctermbg=NONE gui=NONE guifg=#ff875f guibg=NONE
+    highlight! link Title       Normal
     highlight! link LineNr      NonText
     highlight! link TabLine     StatusLineNC
     highlight! link TabLineFill StatusLineNC
diff --git a/vim/vimrc b/vim/vimrc
index 989a7323..f50aaaad 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -10,7 +10,9 @@ endif
 
 " Backups
 set nobackup
-set nowritebackup
+if has("writebackup")
+    set nowritebackup
+endif
 
 " Buffers
 set hidden
@@ -28,16 +30,6 @@ if has("cmdline_info")
     set showmode
 endif
 
-" Completion
-if has("wildmenu")
-    set wildignore+=*.a,*.o
-    set wildignore+=*.bmp,*.gif,*.ico,*.jpg,*.png
-    set wildignore+=.DS_Store,.git,.hg,.svn
-    set wildignore+=*~,*.swp,*.tmp
-    set wildmenu
-    set wildmode=longest,list
-endif
-
 " Encoding
 set fileformats=unix,dos,mac
 if has("multi_byte")
@@ -46,7 +38,7 @@ endif
 
 " Formatting
 set expandtab
-set formatoptions+=coqnr1
+set formatoptions=croqn1
 set nojoinspaces
 set shiftround
 set shiftwidth=4
@@ -67,6 +59,10 @@ nnoremap <leader>r :set relativenumber!<CR>
 nnoremap <leader>s :set spell!<CR>
 nnoremap <leader>w :set wrap!<CR>
 
+" Lines
+nnoremap j gj
+nnoremap k gk
+
 " Macros
 set lazyredraw
 
@@ -83,7 +79,7 @@ set sidescroll=1
 " Search
 set hlsearch
 set incsearch
-nnoremap <C-l> :nohlsearch<CR><C-l>
+nnoremap <silent> <C-l> :nohlsearch<CR><C-l>
 
 " Spelling
 if has("spell")
@@ -94,7 +90,7 @@ endif
 set noswapfile
 
 " Typos
-cnoreabbrev E w
+cnoreabbrev E e
 cnoreabbrev W w
 cnoreabbrev Wq wq
 cnoreabbrev WQ wq
@@ -102,6 +98,16 @@ cnoreabbrev Q q
 cnoreabbrev QA qa
 cnoreabbrev Qa qa
 
+" Wildmenu
+if has("wildmenu")
+    set wildignore+=*.a,*.o
+    set wildignore+=*.bmp,*.gif,*.ico,*.jpg,*.png
+    set wildignore+=.DS_Store,.git,.hg,.svn
+    set wildignore+=*~,*.swp,*.tmp
+    set wildmenu
+    set wildmode=longest,list
+endif
+
 " Windows
 if has("windows")
     set laststatus=1