Fixed a few typos, reset the toggle for goyo to <C/A><F12>, set the

default fold level to 5, made \<space> and \\<space> alt ways to
open/close all folds, improved the gutter toggle method and added an
additional way to access help via <Leader>?
all folds
This commit is contained in:
Kevin MacMartin 2014-07-20 23:55:42 -04:00
parent 486e8be7a8
commit 73628eb7ea
4 changed files with 23 additions and 10 deletions

View file

@ -92,6 +92,7 @@ A theme, config and collection of plugins for Vim.
| \<(Ctrl-or-Alt)-F2\> | ALL | Toggle the **gundo** undo history sidebar | | \<(Ctrl-or-Alt)-F2\> | ALL | Toggle the **gundo** undo history sidebar |
| \<(Ctrl-or-Alt)-F3\> | ALL | Toggle the **tagbar** source code tag sidebar | | \<(Ctrl-or-Alt)-F3\> | ALL | Toggle the **tagbar** source code tag sidebar |
| \<(Ctrl-or-Alt)-F4\> | ALL | Toggle the **extradite** git history window | | \<(Ctrl-or-Alt)-F4\> | ALL | Toggle the **extradite** git history window |
| \<(Ctrl-or-Alt)-F12\> | ALL | Toggle the **goyo** distraction-free mode |
#### Toggles #### #### Toggles ####

View file

@ -29,7 +29,7 @@
" <Ctrl-_>p | (A) -> comment the current paragraph " <Ctrl-_>p | (A) -> comment the current paragraph
" + | (V) -> increase the selected region " + | (V) -> increase the selected region
" _ | (V) -> decrease the selected region " _ | (V) -> decrease the selected region
" <Leader><Space> | (N) -> center content and hide everything else " <Leader><Enter> | (N) -> center content and hide everything else
" "
" (surround) " (surround)
" S" | (V) -> surround selection with quotes " S" | (V) -> surround selection with quotes
@ -78,8 +78,10 @@
" ` | (A) -> toggle the gutter(line numbers, folds and signify) " ` | (A) -> toggle the gutter(line numbers, folds and signify)
" "
" <Space> | (N) -> toggle selected fold " <Space> | (N) -> toggle selected fold
" <Leader><Space> | (N) -> open all folds
" <Leader>= | (N) -> open all folds " <Leader>= | (N) -> open all folds
" <Leader>+ | (N) -> open all folds " <Leader>+ | (N) -> open all folds
" <Leader><Leader><Space> | (N) -> open all folds
" <Leader>- | (N) -> unopen all folds " <Leader>- | (N) -> unopen all folds
" <Leader>_ | (N) -> unopen all folds " <Leader>_ | (N) -> unopen all folds
" <Leader>0 | (N) -> reset all folds using default fold level " <Leader>0 | (N) -> reset all folds using default fold level
@ -98,6 +100,9 @@
" <F3> | (A) -> toggle external-paste mode " <F3> | (A) -> toggle external-paste mode
" <F4> | (A) -> toggle syntax checking " <F4> | (A) -> toggle syntax checking
" "
" <Ctrl-F12> | (A) -> toggle goyo (distraction-free mode)
" <Alt-F12> | (A) -> toggle goyo (distraction-free mode)
"
" (gvim toggles) " (gvim toggles)
" <Leader><F1> | (A) -> toggle the menubar " <Leader><F1> | (A) -> toggle the menubar
" <Leader><F2> | (A) -> toggle the toolbar " <Leader><F2> | (A) -> toggle the toolbar
@ -117,7 +122,7 @@
" <Ctrl-u> | (I) -> (neocomp) undo the most recent completion " <Ctrl-u> | (I) -> (neocomp) undo the most recent completion
" "
" (search) " (search)
" <Leader>\ | (N) -> remove search highlighting " <Leader>/ | (N) -> remove search highlighting
" "
" (formatting) " (formatting)
" <Backspace> | (V) -> deletes currently selected text " <Backspace> | (V) -> deletes currently selected text
@ -213,7 +218,8 @@
" "
" Filetype Specific Mappings: " Filetype Specific Mappings:
" (extradite) " (extradite)
" <F4> | (A) -> close the dialog " <C-F4> | (A) -> close the dialog
" <A-F4> | (A) -> close the dialog
" <Right> | (A) -> same as down " <Right> | (A) -> same as down
" l | (A) -> same as j " l | (A) -> same as j
" <Left> | (A) -> same as Up " <Left> | (A) -> same as Up
@ -379,16 +385,18 @@
nnoremap <silent><expr> <Leader>? ':h index.txt<CR>' nnoremap <silent><expr> <Leader>? ':h index.txt<CR>'
"toggle the display of the left gutter "toggle the display of the left gutter
nnoremap <silent><expr> ` ':if (&number)<Bar>set number!<Bar>if (&foldenable)<Bar>set foldenable!<Bar>endif<Bar>if exists("b:sy")<Bar>if (b:sy.active)<Bar>SignifyToggle<Bar>endif<Bar>endif<Bar>else<Bar>set number!<Bar>if !(&foldenable)<Bar>set foldenable!<Bar>endif<Bar>if exists("b:sy")<Bar>if !(b:sy.active)<Bar>SignifyToggle<Bar>endif<Bar>endif<Bar>endif<CR>:echo "gutter visibility toggled"<CR>' nnoremap <silent><expr> ` ':if (&number)<Bar>set nonumber<Bar>if (&foldenable)<Bar>set nofoldenable<Bar>endif<Bar>if exists("b:sy")<Bar>if (b:sy.active)<Bar>SignifyToggle<Bar>endif<Bar>endif<Bar>else<Bar>set number<Bar>if !(&foldenable)<Bar>set foldenable<Bar>endif<Bar>if exists("b:sy")<Bar>if !(b:sy.active)<Bar>SignifyToggle<Bar>endif<Bar>endif<Bar>endif<CR>:echo "gutter visibility toggled"<CR>'
"toggle folded code at foldpoints "toggle folded code at foldpoints
nnoremap <Space> za nnoremap <Space> za
"open all folds "open all folds
nnoremap <silent><expr> <Leader><Space> 'zn:echo "all folds have been opened"<CR>'
nnoremap <silent><expr> <Leader>= 'zn:echo "all folds have been opened"<CR>' nnoremap <silent><expr> <Leader>= 'zn:echo "all folds have been opened"<CR>'
nnoremap <silent><expr> <Leader>+ 'zn:echo "all folds have been opened"<CR>' nnoremap <silent><expr> <Leader>+ 'zn:echo "all folds have been opened"<CR>'
"close folds set to be closed "close folds set to be closed
nnoremap <silent><expr> <Leader><Leader><Space> 'zN:echo "all opened folds have been closed"<CR>'
nnoremap <silent><expr> <Leader>- 'zN:echo "all opened folds have been closed"<CR>' nnoremap <silent><expr> <Leader>- 'zN:echo "all opened folds have been closed"<CR>'
nnoremap <silent><expr> <Leader>_ 'zN:echo "all opened folds have been closed"<CR>' nnoremap <silent><expr> <Leader>_ 'zN:echo "all opened folds have been closed"<CR>'
@ -444,6 +452,10 @@
nnoremap <silent><expr> <F4> ':if (g:syntastic_check_on_open == 1)<Bar>let g:syntastic_check_on_open=0<Bar>let g:syntastic_check_on_wq=0<Bar>else<Bar>let g:syntastic_check_on_open=1<Bar>let g:syntastic_check_on_wq=1<Bar>endif<Bar>:SyntasticToggleMode<CR>' nnoremap <silent><expr> <F4> ':if (g:syntastic_check_on_open == 1)<Bar>let g:syntastic_check_on_open=0<Bar>let g:syntastic_check_on_wq=0<Bar>else<Bar>let g:syntastic_check_on_open=1<Bar>let g:syntastic_check_on_wq=1<Bar>endif<Bar>:SyntasticToggleMode<CR>'
xnoremap <silent><expr> <F4> '<Esc>:if (g:syntastic_check_on_open == 1)<Bar>let g:syntastic_check_on_open=0<Bar>let g:syntastic_check_on_wq=0<Bar>else<Bar>let g:syntastic_check_on_open=1<Bar>let g:syntastic_check_on_wq=1<Bar>endif<Bar>:SyntasticToggleMode<CR>gv' xnoremap <silent><expr> <F4> '<Esc>:if (g:syntastic_check_on_open == 1)<Bar>let g:syntastic_check_on_open=0<Bar>let g:syntastic_check_on_wq=0<Bar>else<Bar>let g:syntastic_check_on_open=1<Bar>let g:syntastic_check_on_wq=1<Bar>endif<Bar>:SyntasticToggleMode<CR>gv'
inoremap <silent><expr> <F4> '<C-O>:if (g:syntastic_check_on_open == 1)<Bar>let g:syntastic_check_on_open=0<Bar>let g:syntastic_check_on_wq=0<Bar>else<Bar>let g:syntastic_check_on_open=1<Bar>let g:syntastic_check_on_wq=1<Bar>endif<Bar>:SyntasticToggleMode<CR>' inoremap <silent><expr> <F4> '<C-O>:if (g:syntastic_check_on_open == 1)<Bar>let g:syntastic_check_on_open=0<Bar>let g:syntastic_check_on_wq=0<Bar>else<Bar>let g:syntastic_check_on_open=1<Bar>let g:syntastic_check_on_wq=1<Bar>endif<Bar>:SyntasticToggleMode<CR>'
"toggle goyo
nnoremap <silent><expr> <C-F12> ':Goyo<CR>'
nnoremap <silent><expr> <A-F12> ':Goyo<CR>'
"} "}
"GVIM TOGGLES:{ "GVIM TOGGLES:{
@ -640,6 +652,7 @@
if !&diff if !&diff
autocmd FileType help map <buffer> <silent><expr> q ':q<CR>' autocmd FileType help map <buffer> <silent><expr> q ':q<CR>'
autocmd FileType help map <buffer> <silent><expr> <Leader><F1> ':q<CR>' autocmd FileType help map <buffer> <silent><expr> <Leader><F1> ':q<CR>'
autocmd FileType help map <buffer> <silent><expr> <Leader>? ':q<CR>'
endif endif
"markdown: launch table of contents instead of the tagbar "markdown: launch table of contents instead of the tagbar

View file

@ -48,7 +48,6 @@
"}}} "}}}
"GOYO: {{{ "GOYO: {{{
nnoremap <Leader><Space> :Goyo<CR>
autocmd VimEnter,Filetype * autocmd VimEnter,Filetype *
\ let g:goyo_width = &textwidth | \ let g:goyo_width = &textwidth |
\ if (g:goyo_width == 0) | \ if (g:goyo_width == 0) |
@ -123,10 +122,10 @@
"}}} "}}}
"SIGNIFY: {{{ "SIGNIFY: {{{
let g:signify_sign_add = '+' let g:signify_sign_add='+'
let g:signify_sign_change = '!' let g:signify_sign_change='!'
let g:signify_sign_delete = '-' let g:signify_sign_delete='-'
let g:signify_sign_delete_first_line = '~' let g:signify_sign_delete_first_line='~'
"}}} "}}}
"SYNTASTIC: {{{ "SYNTASTIC: {{{

View file

@ -51,7 +51,7 @@
set hlsearch incsearch ignorecase smartcase "configure search set hlsearch incsearch ignorecase smartcase "configure search
set diffopt=foldcolumn:0,filler "vimdiff default settings set diffopt=foldcolumn:0,filler "vimdiff default settings
set formatoptions=roqnl12 "how automatic formatting is to be done set formatoptions=roqnl12 "how automatic formatting is to be done
set foldmethod=syntax foldcolumn=1 foldlevel=3 "fold layers 3 or more deep set foldmethod=syntax foldcolumn=1 foldlevel=5 "fold layers 5 or more deep
let &showbreak="" "highlight wrapped lines when linewrap is enabled let &showbreak="" "highlight wrapped lines when linewrap is enabled
"enable tab completion in command mode and configure how it handles extensions "enable tab completion in command mode and configure how it handles extensions