]> git.madduck.net Git - etc/vim.git/blobdiff - .vimrc

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

correct nospell for dlmsg/dpmsg macros
[etc/vim.git] / .vimrc
diff --git a/.vimrc b/.vimrc
index 9ecc0f21071399a942b92fdf617b6362a848cd9c..59409c38e9232a42756681258478f727f74265f6 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -195,7 +195,7 @@ set nowrap
 " wrap long lines at a character in 'breakat'
 "       (local to window)
 "       set nolbr       lbr
-set linebreak
+" does not work with autocmd set list/nolist below
 
 " breakat
 " which characters might cause a line break
@@ -1134,7 +1134,7 @@ set hi=100
 " wildmode
 " specifies how command line completion works
 "       set wim=full
-set wim=list
+set wim=list:full
 
 " suffixes
 " list of file name extensions that have a lower priority
@@ -1448,10 +1448,6 @@ colorscheme madduck
 autocmd BufNewFile,BufRead /etc/logcheck/*.d*/* set tw=0
 autocmd BufNewFile,BufRead /home/madduck/debian/pkg/logcheck/*/rulefiles/linux/*.d*/* set tw=0
 
-" display the git-diff --cached in window below commit
-" assumes nosplitbelow set. Might want to use wincmd p otherwise
-autocmd FileType gitcommit DiffGitCached | wincmd J
-
 " jump to last known position in file (:he last-position-jump)
 autocmd BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"zz" | endif
 
@@ -1467,10 +1463,12 @@ let s:cpo_save=&cpo
 set cpo&vim
 
 " treat wrapped lines normally
-map k gk
-map <Up> gk
-map j gj
-map <Down> gj
+nnoremap k gk
+nnoremap <Up> gk
+inoremap <Up> <C-\><C-o>gk
+nnoremap j gj
+nnoremap <Down> gj
+inoremap <Down> <C-\><C-o>gj
 
 " this isn't windows, screw the F1->help key
 map <F1> <Esc>