Move functions into 'eval' check
This commit is contained in:
parent
7f0ec704f5
commit
2652e76ba2
1 changed files with 61 additions and 60 deletions
121
vimrc
121
vimrc
|
|
@ -145,6 +145,67 @@ if has('eval')
|
||||||
"
|
"
|
||||||
" Set theme for Terminal.
|
" Set theme for Terminal.
|
||||||
colorscheme tempus_night
|
colorscheme tempus_night
|
||||||
|
|
||||||
|
function! ACPToggleMargins()
|
||||||
|
execute "set colorcolumn=" . (&colorcolumn == "0" ? "73,81" : "0")
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! ACPToggleSpellEnUs()
|
||||||
|
if &spell == 0
|
||||||
|
setlocal spell spelllang=en_us
|
||||||
|
echo "Spelling ON (en_US)"
|
||||||
|
else
|
||||||
|
setlocal nospell
|
||||||
|
echo "Spelling OFF"
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! ACPToggleSpellEnGb()
|
||||||
|
if &spell == 0
|
||||||
|
setlocal spell spelllang=en_gb
|
||||||
|
echo "Spelling ON (en_GB)"
|
||||||
|
else
|
||||||
|
setlocal nospell
|
||||||
|
echo "Spelling OFF"
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! ACPActodoTodo()
|
||||||
|
" Toggles between TODO, WORK, WAIT, DONE, and blank.
|
||||||
|
" All are highlighted except DONE and blank.
|
||||||
|
" Must be at the start of the line, optionally preceeded with
|
||||||
|
" whitespace. This makes it work for actodo lists.
|
||||||
|
if getline(line(".")) =~# "TODO: "
|
||||||
|
s/^\(\s*\)TODO: /\1WORK: /e
|
||||||
|
elseif getline(line(".")) =~# "WORK: "
|
||||||
|
s/^\(\s*\)WORK: /\1WAIT: /e
|
||||||
|
elseif getline(line(".")) =~# "WAIT: "
|
||||||
|
s/^\(\s*\)WAIT: /\1DONE: /e
|
||||||
|
elseif getline(line(".")) =~# "DONE: "
|
||||||
|
s/^\(\s*\)DONE: /\1/e
|
||||||
|
else
|
||||||
|
s/^\(\s*\)/\1TODO: /e
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! ACPAdocTodo()
|
||||||
|
" Toggles between TODO, WORK, WAIT, DONE, and blank.
|
||||||
|
" All are highlighted except DONE and blank.
|
||||||
|
" Must be at the start of the line, optionally preceeded with an
|
||||||
|
" asterisk and a space. This makes it work for Asciidoc lists.
|
||||||
|
if getline(line(".")) =~# "[#][*]TODO:[*][#] "
|
||||||
|
s/^\(\**\s*\)#\*TODO:\*# /\1#*WORK:*# /e
|
||||||
|
elseif getline(line(".")) =~# "[#][*]WORK:[*][#] "
|
||||||
|
s/^\(\**\s*\)#\*WORK:\*# /\1#*WAIT:*# /e
|
||||||
|
elseif getline(line(".")) =~# "[#][*]WAIT:[*][#] "
|
||||||
|
s/^\(\**\s*\)#\*WAIT:\*# /\1*DONE:* /e
|
||||||
|
elseif getline(line(".")) =~# "[*]DONE:[*] "
|
||||||
|
s/^\(\**\s*\)\*DONE:\* /\1/e
|
||||||
|
else
|
||||||
|
s/^\(\**\s*\)/\1#*TODO:*# /e
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
"===============================================================================
|
"===============================================================================
|
||||||
|
|
@ -238,66 +299,6 @@ if has("patch-8.1.1719") && (executable("nodejs") || executable("node"))
|
||||||
packadd coc.nvim
|
packadd coc.nvim
|
||||||
endif
|
endif
|
||||||
|
|
||||||
function! ACPToggleMargins()
|
|
||||||
execute "set colorcolumn=" . (&colorcolumn == "0" ? "73,81" : "0")
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! ACPToggleSpellEnUs()
|
|
||||||
if &spell == 0
|
|
||||||
setlocal spell spelllang=en_us
|
|
||||||
echo "Spelling ON (en_US)"
|
|
||||||
else
|
|
||||||
setlocal nospell
|
|
||||||
echo "Spelling OFF"
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! ACPToggleSpellEnGb()
|
|
||||||
if &spell == 0
|
|
||||||
setlocal spell spelllang=en_gb
|
|
||||||
echo "Spelling ON (en_GB)"
|
|
||||||
else
|
|
||||||
setlocal nospell
|
|
||||||
echo "Spelling OFF"
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! ACPActodoTodo()
|
|
||||||
" Toggles between TODO, WORK, WAIT, DONE, and blank.
|
|
||||||
" All are highlighted except DONE and blank.
|
|
||||||
" Must be at the start of the line, optionally preceeded with
|
|
||||||
" whitespace. This makes it work for actodo lists.
|
|
||||||
if getline(line(".")) =~# "TODO: "
|
|
||||||
s/^\(\s*\)TODO: /\1WORK: /e
|
|
||||||
elseif getline(line(".")) =~# "WORK: "
|
|
||||||
s/^\(\s*\)WORK: /\1WAIT: /e
|
|
||||||
elseif getline(line(".")) =~# "WAIT: "
|
|
||||||
s/^\(\s*\)WAIT: /\1DONE: /e
|
|
||||||
elseif getline(line(".")) =~# "DONE: "
|
|
||||||
s/^\(\s*\)DONE: /\1/e
|
|
||||||
else
|
|
||||||
s/^\(\s*\)/\1TODO: /e
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! ACPAdocTodo()
|
|
||||||
" Toggles between TODO, WORK, WAIT, DONE, and blank.
|
|
||||||
" All are highlighted except DONE and blank.
|
|
||||||
" Must be at the start of the line, optionally preceeded with an
|
|
||||||
" asterisk and a space. This makes it work for Asciidoc lists.
|
|
||||||
if getline(line(".")) =~# "[#][*]TODO:[*][#] "
|
|
||||||
s/^\(\**\s*\)#\*TODO:\*# /\1#*WORK:*# /e
|
|
||||||
elseif getline(line(".")) =~# "[#][*]WORK:[*][#] "
|
|
||||||
s/^\(\**\s*\)#\*WORK:\*# /\1#*WAIT:*# /e
|
|
||||||
elseif getline(line(".")) =~# "[#][*]WAIT:[*][#] "
|
|
||||||
s/^\(\**\s*\)#\*WAIT:\*# /\1*DONE:* /e
|
|
||||||
elseif getline(line(".")) =~# "[*]DONE:[*] "
|
|
||||||
s/^\(\**\s*\)\*DONE:\* /\1/e
|
|
||||||
else
|
|
||||||
s/^\(\**\s*\)/\1#*TODO:*# /e
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
" Customise colour schemes. Keep this near the end.
|
" Customise colour schemes. Keep this near the end.
|
||||||
if &background ==# 'light'
|
if &background ==# 'light'
|
||||||
highlight SpecialKey ctermfg=lightgray ctermbg=NONE
|
highlight SpecialKey ctermfg=lightgray ctermbg=NONE
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue