aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Christian Pohle2017-07-05 21:28:23 +0200
committerMax Christian Pohle2017-07-05 21:28:23 +0200
commitd29f07ae716a12dbc973c5da46bdf6a3175cd714 (patch)
treeba29bcbefc14d14316268f39689562cfb987cf61
parentabdffecf5d984f5de8de1cdf4b10550a0af3ea1b (diff)
parent4ac77e9c172de45b5f903784a0f5f20ec6c3a77b (diff)
downloadvim-d29f07ae716a12dbc973c5da46bdf6a3175cd714.tar.bz2
vim-d29f07ae716a12dbc973c5da46bdf6a3175cd714.zip
Merge branch 'master' of ssh://typesafe.de/~/config/vim
-rw-r--r--vimrc-full19
1 files changed, 9 insertions, 10 deletions
diff --git a/vimrc-full b/vimrc-full
index 3fdb399..ad97b32 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -465,8 +465,9 @@ if has("multi_byte")
465 set encoding=utf-8 | " we need default utf-8 encoding to use cool chars as line break and so on (see below) 465 set encoding=utf-8 | " we need default utf-8 encoding to use cool chars as line break and so on (see below)
466 set termencoding=&encoding | " once we use special chars we assume everybody uses a terminal supporting those 466 set termencoding=&encoding | " once we use special chars we assume everybody uses a terminal supporting those
467 467
468 set fillchars+=fold:\— | " 468 set fillchars+=fold:\— | "
469 set fillchars+=vert:\│ | " cool vertical split char 469 set fillchars+=vert:\│ | " cool vertical split char
470 set fillchars+=diff:\ | " a whitespace gets used here
470 471
471 set listchars= | " initialize empty listchars 472 set listchars= | " initialize empty listchars
472 set listchars+=extends:» | " symbols used when using :set list (which displays non-printable chars) 473 set listchars+=extends:» | " symbols used when using :set list (which displays non-printable chars)
@@ -489,14 +490,12 @@ if has('cscope') " compiled with cscope support?
489 set cscopequickfix=s+,c+,d+,i+,t+,e+ 490 set cscopequickfix=s+,c+,d+,i+,t+,e+
490 endif 491 endif
491 492
492 cnoreabbrev csa cs add 493 " cnoreabbrev csa cs add
493 cnoreabbrev csf cs find 494 " cnoreabbrev csf cs find
494 cnoreabbrev csk cs kill 495 " cnoreabbrev csk cs kill
495 cnoreabbrev csr cs reset 496 " cnoreabbrev csr cs reset
496 cnoreabbrev css cs show 497 " cnoreabbrev css cs show
497 cnoreabbrev csh cs help 498 " cnoreabbrev csh cs help
498
499 command! -nargs=0 Cscope cs add $VIMSRC/src/cscope.out $VIMSRC/src
500 let @c = ":cs find s <cword>" 499 let @c = ":cs find s <cword>"
501endif 500endif
502 501
..