aboutsummaryrefslogtreecommitdiff
path: root/vim/vimrc
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2012-01-02 18:27:14 +1300
committerTom Ryder <tom@sanctum.geek.nz>2012-01-02 18:27:14 +1300
commit933283e54e251767cc18e02f7e869ba12bf35f52 (patch)
tree7c561c15e55192b2e3ae5c9a534c5598f2a93d56 /vim/vimrc
parentNew custom syntax color file. (diff)
downloaddotfiles-933283e54e251767cc18e02f7e869ba12bf35f52.tar.gz
dotfiles-933283e54e251767cc18e02f7e869ba12bf35f52.zip
Further tweakings.
Diffstat (limited to 'vim/vimrc')
-rw-r--r--vim/vimrc34
1 files changed, 20 insertions, 14 deletions
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