aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Christian Pohle2018-06-20 23:03:55 +0200
committerMax Christian Pohle2018-06-20 23:03:55 +0200
commit20f44bf13a43456f37245c9d4d76e9be193ecd60 (patch)
tree1155ef82b4a6c51dd4d6613e2e96846e5dd462e4
parent72bc799d4d3da199d3f4d97ab41fe85ca75bfd76 (diff)
downloadvim-karlmarks-20f44bf13a43456f37245c9d4d76e9be193ecd60.tar.bz2
vim-karlmarks-20f44bf13a43456f37245c9d4d76e9be193ecd60.zip
Fixed code folding bug
also added some Git menu enties improved the recently used files startup screen improved the foltext by removing double white spaces improved contextual statusline
-rw-r--r--after/syntax/c.vim4
-rw-r--r--doc/shortcuts.txt3
-rw-r--r--vimrc-full15
3 files changed, 16 insertions, 6 deletions
diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index 75170cf..9ffe0ae 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -15,8 +15,8 @@ syntax match Comment "//.*" contains=Todo
15syn clear cBlock 15syn clear cBlock
16syn region cBlock start=/{/ end=/}/ transparent 16syn region cBlock start=/{/ end=/}/ transparent
17 17
18" multiple single line comments in a row 18" multiple single line comments in a row " broken!
19syn region myCComment start="/\*" end="\*/" fold keepend transparent 19" syn region myCComment start="/\*" end="\*/" fold keepend transparent
20 20
21 21
22" let b:current_syntax = "c" 22" let b:current_syntax = "c"
diff --git a/doc/shortcuts.txt b/doc/shortcuts.txt
index 6cdebec..4d58590 100644
--- a/doc/shortcuts.txt
+++ b/doc/shortcuts.txt
@@ -124,6 +124,9 @@ zE = eliminates all folds
124:b <tab> = switch buffer by name (use <tab> and <return>) 124:b <tab> = switch buffer by name (use <tab> and <return>)
125:set nobuflisted = hide buffer in buffer list (great for neovim's terminal) 125:set nobuflisted = hide buffer in buffer list (great for neovim's terminal)
126 126
127[args]
128:n **/*.c = opens all files with that name or type in buffers and also fills the argument list
129
127 130
128[special] 131[special]
129g CTRL-g = display file properties including word and char count 132g CTRL-g = display file properties including word and char count
diff --git a/vimrc-full b/vimrc-full
index d049e85..ca36df7 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -240,7 +240,7 @@ set foldopen=block,hor,search | " when do we unfold?
240" set foldtext=Foldtext() | " 240" set foldtext=Foldtext() | "
241" set foldtext=v:folddashes.substitute(getline(v:foldstart),'\\v^/[/*]\','','g') 241" set foldtext=v:folddashes.substitute(getline(v:foldstart),'\\v^/[/*]\','','g')
242" set foldtext='⊞\ '.substitute(getline(v:foldstart),'^[\ '.printf(&cms,'').']*','','').'↵'.getline(v:foldstart+1).'↵'.getline(v:foldstart+2) 242" set foldtext='⊞\ '.substitute(getline(v:foldstart),'^[\ '.printf(&cms,'').']*','','').'↵'.getline(v:foldstart+1).'↵'.getline(v:foldstart+2)
243 set foldtext='⊞\ '.substitute(join(getline(v:foldstart,v:foldend),'↵'),'\[*\/\]','','g') 243set foldtext='⊞\ '.substitute(substitute(join(getline(v:foldstart,v:foldend)),'\\s\\s\\+\\\|\[\*\/\]','\ ','g'),'\^\\s\\+','','g')
244 244
245" vim window behaviour 245" vim window behaviour
246set splitbelow | " open new windows below the current one (i find that more intuitive) 246set splitbelow | " open new windows below the current one (i find that more intuitive)
@@ -512,6 +512,8 @@ if has("autocmd")
512 \ :call setloclist(0, map(systemlist("git show --name-only --pretty=''"), {_, p->{'filename': fnamemodify(p, ':.')}}))<CR>:lopen<CR> 512 \ :call setloclist(0, map(systemlist("git show --name-only --pretty=''"), {_, p->{'filename': fnamemodify(p, ':.')}}))<CR>:lopen<CR>
513 menu &Git.&Display\ last\ changes 513 menu &Git.&Display\ last\ changes
514 \ :let g:signify_vcs_cmds={'git': 'git diff --no-color --no-ext-diff -U0 HEAD^ -- %f'}<CR>:SignifyRefresh<CR> 514 \ :let g:signify_vcs_cmds={'git': 'git diff --no-color --no-ext-diff -U0 HEAD^ -- %f'}<CR>:SignifyRefresh<CR>
515 menu &Git.&Display\ unmerged\ files\ in\ location\ list
516 \ :call setloclist(0, map(systemlist("git diff --name-only --diff-filter=U \| uniq"), {_, p->{'filename': fnamemodify(p, ':.')}}))<CR>:lopen<CR>
515 menu &Git.&Display\ significance\ of\ changes 517 menu &Git.&Display\ significance\ of\ changes
516 \ :!git diff --stat HEAD~1..HEAD 518 \ :!git diff --stat HEAD~1..HEAD
517 menu &Git.&Display\ Changed\ files\ compared\ to\ master 519 menu &Git.&Display\ Changed\ files\ compared\ to\ master
@@ -1042,9 +1044,14 @@ if empty(argv())
1042 " from the list of recent files: make absolute paths, filter out files not 1044 " from the list of recent files: make absolute paths, filter out files not
1043 " contained in cwd and finally filter out directories and non-files... 1045 " contained in cwd and finally filter out directories and non-files...
1044 autocmd StdinReadPre * let s:std_in=1 1046 autocmd StdinReadPre * let s:std_in=1
1045 autocmd VimEnter * if !exists("s:std_in") | call setqflist(map(filter(filter( 1047 autocmd VimEnter * if !exists("s:std_in") | call setqflist([], 'r',
1046 \ map(copy(v:oldfiles), {_, p->expand(p)}), 'v:val =~ "'.getcwd().'"'), 1048 \ {
1047 \ 'filereadable(v:val)'), {_, p->{'filename': fnamemodify(p, ':.')}})) | copen | only 1049 \ 'title':'Recently used files in directory: '.getcwd(),
1050 \ 'items':map(filter(filter(
1051 \ map(copy(v:oldfiles),
1052 \ {_, p->expand(p)}), 'v:val =~ "'.getcwd().'/"'), 'filereadable(v:val)'),
1053 \ {_, p->{'filename': fnamemodify(p, ':.')}})
1054 \ }) | copen | only
1048endif 1055endif
1049 1056
1050command Vimls 1057command Vimls
..