Compare commits

..

No commits in common. "db2224127ad2b7a9211f2e2b1bf96d5b20e66b3d" and "52adcb3dc1dbcd4649ec64d45aad40997de84e21" have entirely different histories.

3 changed files with 74 additions and 84 deletions

24
.vim/after/syntax/c.vim Normal file
View File

@ -0,0 +1,24 @@
if !has('conceal')
finish
endif
setlocal conceallevel=1
syntax clear cOperator
"syntax match cOperator "++" conceal cchar=⧺
"syntax match cOperator "=\@<!===\@!" conceal cchar=⇔
syntax match cOperator "!=" conceal cchar=
syntax match cOperator "<=" conceal cchar=
syntax match cOperator ">=" conceal cchar=
syntax match cOperator "<<" conceal cchar=«
syntax match cOperator ">>" conceal cchar=»
syntax match cOperator "::" conceal cchar=
syntax match cOperator "->" conceal cchar=
syntax match cOperator "||" conceal cchar=
hi! link cOperator Operator
hi! link Conceal Operator

24
.vim/after/syntax/cpp.vim Normal file
View File

@ -0,0 +1,24 @@
if !has('conceal')
finish
endif
setlocal conceallevel=1
syntax clear cppOperator
"syntax match cppOperator "++" conceal cchar=⧺
"syntax match cppOperator "=\@<!===\@!" conceal cchar=≖
syntax match cppOperator "!=" conceal cchar=
syntax match cppOperator "<=" conceal cchar=
syntax match cppOperator ">=" conceal cchar=
syntax match cppOperator "<<" conceal cchar=«
syntax match cppOperator ">>" conceal cchar=»
syntax match cppOperator "::" conceal cchar=
syntax match cppOperator "->" conceal cchar=
syntax match cppOperator "||" conceal cchar=
hi! link cppOperator Operator
hi! link Conceal Operator

View File

@ -1,8 +1,7 @@
" Vim filetype plugin file " Vim filetype plugin file
" Language: man " Language: man
" Maintainer: SungHyun Nam <goweol@gmail.com> " Maintainer: SungHyun Nam <goweol@gmail.com>
" Last Change: 2019 Sep 26 " Last Change: 2014 Dec 29
" (fix by Jason Franklin)
" To make the ":Man" command available before editing a manual page, source " To make the ":Man" command available before editing a manual page, source
" this script from your startup vimrc file. " this script from your startup vimrc file.
@ -15,49 +14,34 @@ if &filetype == "man"
finish finish
endif endif
let b:did_ftplugin = 1 let b:did_ftplugin = 1
endif
let s:cpo_save = &cpo " Ensure Vim is not recursively invoked (man-db does this)
set cpo-=C " when doing ctrl-[ on a man page reference.
if exists("$MANPAGER")
let $MANPAGER = ""
endif
if &filetype == "man"
" allow dot and dash in manual page name. " allow dot and dash in manual page name.
setlocal iskeyword+=\.,- setlocal iskeyword+=\.,-
let b:undo_ftplugin = "setlocal iskeyword<"
" Add mappings, unless the user didn't want this. " Add mappings, unless the user didn't want this.
if !exists("no_plugin_maps") && !exists("no_man_maps") if !exists("no_plugin_maps") && !exists("no_man_maps")
if !hasmapto('<Plug>ManBS') if !hasmapto('<Plug>ManBS')
nmap <buffer> <LocalLeader>h <Plug>ManBS nmap <buffer> <LocalLeader>h <Plug>ManBS
let b:undo_ftplugin = b:undo_ftplugin
\ . '|silent! nunmap <buffer> <LocalLeader>h'
endif endif
nnoremap <buffer> <Plug>ManBS :%s/.\b//g<CR>:setl nomod<CR>'' nnoremap <buffer> <Plug>ManBS :%s/.\b//g<CR>:setl nomod<CR>''
nnoremap <buffer> <c-]> :call <SID>PreGetPage(v:count)<CR> nnoremap <buffer> <c-]> :call <SID>PreGetPage(v:count)<CR>
nnoremap <buffer> <c-t> :call <SID>PopPage()<CR> nnoremap <buffer> <c-t> :call <SID>PopPage()<CR>
nnoremap <buffer> <silent> q :q<CR>
" Add undo commands for the maps
let b:undo_ftplugin = b:undo_ftplugin
\ . '|silent! nunmap <buffer> <Plug>ManBS'
\ . '|silent! nunmap <buffer> <c-]>'
\ . '|silent! nunmap <buffer> <c-t>'
\ . '|silent! nunmap <buffer> q'
endif endif
if exists('g:ft_man_folding_enable') && (g:ft_man_folding_enable == 1) let b:undo_ftplugin = "setlocal iskeyword<"
setlocal foldmethod=indent foldnestmax=1 foldenable
let b:undo_ftplugin = b:undo_ftplugin
\ . '|silent! setl fdm< fdn< fen<'
endif
endif endif
if exists(":Man") != 2 if exists(":Man") != 2
com -nargs=+ -complete=shellcmd Man call s:GetPage(<q-mods>, <f-args>) com -nargs=+ Man call s:GetPage(<f-args>)
nmap <Leader>K :call <SID>PreGetPage(0)<CR> nmap <Leader>K :call <SID>PreGetPage(0)<CR>
nmap <Plug>ManPreGetPage :call <SID>PreGetPage(0)<CR>
endif endif
" Define functions only once. " Define functions only once.
@ -107,7 +91,7 @@ func <SID>GetCmdArg(sect, page)
endfunc endfunc
func <SID>FindPage(sect, page) func <SID>FindPage(sect, page)
let where = system("man ".s:man_find_arg.' '.s:GetCmdArg(a:sect, a:page)) let where = system("/usr/bin/man ".s:man_find_arg.' '.s:GetCmdArg(a:sect, a:page))
if where !~ "^/" if where !~ "^/"
if matchstr(where, " [^ ]*$") !~ "^ /" if matchstr(where, " [^ ]*$") !~ "^ /"
return 0 return 0
@ -116,7 +100,7 @@ func <SID>FindPage(sect, page)
return 1 return 1
endfunc endfunc
func <SID>GetPage(cmdmods, ...) func <SID>GetPage(...)
if a:0 >= 2 if a:0 >= 2
let sect = a:1 let sect = a:1
let page = a:2 let page = a:2
@ -132,17 +116,11 @@ func <SID>GetPage(cmdmods, ...)
let page = expand('<cword>') let page = expand('<cword>')
endif endif
if !exists('g:ft_man_no_sect_fallback') || (g:ft_man_no_sect_fallback == 0) if sect != "" && s:FindPage(sect, page) == 0
if sect != "" && s:FindPage(sect, page) == 0 let sect = ""
let sect = ""
endif
endif endif
if s:FindPage(sect, page) == 0 if s:FindPage(sect, page) == 0
let msg = "\nNo manual entry for ".page echo "\nCannot find a '".page."'."
if sect != ""
let msg .= " in section ".sect
endif
echo msg
return return
endif endif
exec "let s:man_tag_buf_".s:man_tag_depth." = ".bufnr("%") exec "let s:man_tag_buf_".s:man_tag_depth." = ".bufnr("%")
@ -150,8 +128,6 @@ func <SID>GetPage(cmdmods, ...)
exec "let s:man_tag_col_".s:man_tag_depth." = ".col(".") exec "let s:man_tag_col_".s:man_tag_depth." = ".col(".")
let s:man_tag_depth = s:man_tag_depth + 1 let s:man_tag_depth = s:man_tag_depth + 1
let open_cmd = 'edit'
" Use an existing "man" window if it exists, otherwise open a new one. " Use an existing "man" window if it exists, otherwise open a new one.
if &filetype != "man" if &filetype != "man"
let thiswin = winnr() let thiswin = winnr()
@ -169,60 +145,29 @@ func <SID>GetPage(cmdmods, ...)
endwhile endwhile
endif endif
if &filetype != "man" if &filetype != "man"
if exists("g:ft_man_open_mode") new
if g:ft_man_open_mode == 'vert' setl nonu fdc=0
let open_cmd = 'vsplit'
elseif g:ft_man_open_mode == 'tab'
let open_cmd = 'tabedit'
else
let open_cmd = 'split'
endif
else
let open_cmd = a:cmdmods . ' split'
endif
endif endif
endif endif
silent exec "edit $HOME/".page.".".sect."~"
silent execute open_cmd . " $HOME/" . page . '.' . sect . '~'
" Avoid warning for editing the dummy file twice " Avoid warning for editing the dummy file twice
setl buftype=nofile noswapfile setl buftype=nofile noswapfile
setl fdc=0 ma nofen nonu nornu setl ma nonu nornu nofen
silent exec "norm! 1GdG" silent exec "norm 1GdG"
let unsetwidth = 0 let $MANWIDTH = winwidth(0)
if empty($MANWIDTH) silent exec "r!/usr/bin/man ".s:GetCmdArg(sect, page)." | col -b"
let $MANWIDTH = winwidth(0)
let unsetwidth = 1
endif
" Ensure Vim is not recursively invoked (man-db does this) when doing ctrl-[
" on a man page reference by unsetting MANPAGER.
" Some versions of env(1) do not support the '-u' option, and in such case
" we set MANPAGER=cat.
if !exists('s:env_has_u')
call system('env -u x true')
let s:env_has_u = (v:shell_error == 0)
endif
let env_cmd = s:env_has_u ? 'env -u MANPAGER' : 'env MANPAGER=cat'
let man_cmd = env_cmd . ' man ' . s:GetCmdArg(sect, page) . ' | col -b'
silent exec "r !" . man_cmd
if unsetwidth
let $MANWIDTH = ''
endif
" Remove blank lines from top and bottom. " Remove blank lines from top and bottom.
while line('$') > 1 && getline(1) =~ '^\s*$' while getline(1) =~ '^\s*$'
silent keepj norm! ggdd silent keepj norm ggdd
endwhile endwhile
while line('$') > 1 && getline('$') =~ '^\s*$' while getline('$') =~ '^\s*$'
silent keepj norm! Gdd silent keepj norm Gdd
endwhile endwhile
1 1
setl ft=man nomod setl ft=man nomod
setl bufhidden=hide setl bufhidden=hide
setl nobuflisted setl nobuflisted
setl noma
endfunc endfunc
func <SID>PopPage() func <SID>PopPage()
@ -233,7 +178,7 @@ func <SID>PopPage()
exec "let s:man_tag_col=s:man_tag_col_".s:man_tag_depth exec "let s:man_tag_col=s:man_tag_col_".s:man_tag_depth
exec s:man_tag_buf."b" exec s:man_tag_buf."b"
exec s:man_tag_lin exec s:man_tag_lin
exec "norm! ".s:man_tag_col."|" exec "norm ".s:man_tag_col."|"
exec "unlet s:man_tag_buf_".s:man_tag_depth exec "unlet s:man_tag_buf_".s:man_tag_depth
exec "unlet s:man_tag_lin_".s:man_tag_depth exec "unlet s:man_tag_lin_".s:man_tag_depth
exec "unlet s:man_tag_col_".s:man_tag_depth exec "unlet s:man_tag_col_".s:man_tag_depth
@ -243,7 +188,4 @@ endfunc
endif endif
let &cpo = s:cpo_save " vim: set sw=2:
unlet s:cpo_save
" vim: set sw=2 ts=8 noet: