aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Christian Pohle2018-02-07 23:58:15 +0100
committerMax Christian Pohle2018-02-07 23:58:15 +0100
commit6a9632cbb7dc3267fd1743da40d2b0ab1c52917c (patch)
tree212e36c899e2a2009573dd9cf45f3130b19ba5eb
parent449c7d316d7176c0fe44bf570d18d013fe3f3272 (diff)
downloadvim-karlmarks-6a9632cbb7dc3267fd1743da40d2b0ab1c52917c.tar.bz2
vim-karlmarks-6a9632cbb7dc3267fd1743da40d2b0ab1c52917c.zip
Improved foldtext, removed default textwidth=120
-rw-r--r--after/syntax/c.vim7
-rw-r--r--vimrc-full6
2 files changed, 8 insertions, 5 deletions
diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index ca694a2..0fa1fda 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -6,11 +6,14 @@ set foldmethod=syntax
6" syn clear cStructure 6" syn clear cStructure
7" highlight! link defines Special 7" highlight! link defines Special
8syntax match Define "\<[A-Z][A-Z0-9_]*\>" 8syntax match Define "\<[A-Z][A-Z0-9_]*\>"
9syntax match Todo "\/\/ @[A-Z]*\:.*$" 9" syntax match Todo "\/\/ @[A-Z]*\:.*$"
10syntax keyword Todo TODO contained
11syntax match Comment "//.*" contains=Todo
12
10 13
11" clear default group for a cBlock so we can redefine it without the fold option 14" clear default group for a cBlock so we can redefine it without the fold option
12syn clear cBlock 15syn clear cBlock
13syn region cBlock start=/{/ end=/}/ transparent 16syn region cBlock start=/{/ end=/}/ transparent
14 17
15" multiple single line comments in a row 18" multiple single line comments in a row
16syn match cComment /\v\/\/.*(\_.\/\/.*)+/ fold 19syn match cComment /\v\/\/.*(\_.\/\/.*)+/ fold
diff --git a/vimrc-full b/vimrc-full
index 494495d..be99a64 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -4,7 +4,7 @@
4" GENERAL: 4" GENERAL:
5"======================================================================================================================= 5"=======================================================================================================================
6set exrc | " enable exrc, a specific .exrc per project, which can contain usual .vimrc commands 6set exrc | " enable exrc, a specific .exrc per project, which can contain usual .vimrc commands
7set textwidth=120 | " better done with modeline or local exrc 7set textwidth=0 | " better done with modeline or local exrc and not here
8set ts=4 sts=4 sw=4 expandtab | " better done with a modeline or local exrc 8set ts=4 sts=4 sw=4 expandtab | " better done with a modeline or local exrc
9set virtualedit=all | " virtual edit should be default behaviour, because I don't see any reason against 9set virtualedit=all | " virtual edit should be default behaviour, because I don't see any reason against
10set nonumber norelativenumber | " do not show numbers by default, because that causes a performance loss, instead activate them on a file type basis 10set nonumber norelativenumber | " do not show numbers by default, because that causes a performance loss, instead activate them on a file type basis
@@ -223,9 +223,9 @@ set foldcolumn=0 | " I think I don't need this second indicator
223" set foldmethod=syntax | " foldlevel: syntax, indent, manual / foldmethod=syntax makes Vim incredible slow 223" set foldmethod=syntax | " foldlevel: syntax, indent, manual / foldmethod=syntax makes Vim incredible slow
224set foldnestmax=1 | " top level folding only 224set foldnestmax=1 | " top level folding only
225set foldopen=block,hor,search | " when do we unfold? 225set foldopen=block,hor,search | " when do we unfold?
226let v:foldstart = "FOO"
227" set foldtext=Foldtext() | " 226" set foldtext=Foldtext() | "
228set foldtext=v:folddashes.substitute(getline(v:foldstart),'\\v^/[/*]\','','g') 227" set foldtext=v:folddashes.substitute(getline(v:foldstart),'\\v^/[/*]\','','g')
228set foldtext='⊞\ '.getline(v:foldstart).getline(v:foldstart+1).'↵'.getline(v:foldstart+2)
229 229
230" vim window behaviour 230" vim window behaviour
231set splitbelow | " open new windows below the current one (i find that more intuitive) 231set splitbelow | " open new windows below the current one (i find that more intuitive)
..