From 8a7b15cf35f9873395916487c33b817673c56d86 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 10 Aug 2016 23:52:25 -0400 Subject: vim-patch:7.4.1898 Problem: User commands don't support modifiers. Solution: Add the item. (Yegappan Lakshmanan, closes vim/vim#829) https://github.com/vim/vim/commit/63a60ded3fd584847a05dccf058026e682abad90 --- runtime/doc/map.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'runtime') diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index c1eef398e2..4561020d22 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1406,6 +1406,27 @@ The valid escape sequences are (See the '-bang' attribute) Expands to a ! if the command was executed with a ! modifier, otherwise expands to nothing. + ** + The command modifiers, if specified. Otherwise, expands to + nothing. Supported modifiers are |aboveleft|, |belowright|, + |botright|, |browse|, |confirm|, |hide|, |keepalt|, + |keepjumps|, |keepmarks|, |keeppatterns|, |lockmarks|, + |noswapfile|, |silent|, |tab|, |topleft|, |verbose|, and + |vertical|. + Examples: > + command! -nargs=+ -complete=file MyEdit + \ for f in expand(, 0, 1) | + \ exe ' split ' . f | + \ endfor + + function! SpecialEdit(files, mods) + for f in expand(a:files, 0, 1) + exe a:mods . ' split ' . f + endfor + endfunction + command! -nargs=+ -complete=file Sedit + \ call SpecialEdit(, ) +< ** ** (See the '-register' attribute) The optional register, if specified. Otherwise, expands to nothing. -- cgit From 728d5823331cf9d36ffa8389e5819e67324735d8 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Thu, 11 Aug 2016 10:20:44 -0400 Subject: man.vim: support for command modifiers Closes #5235 --- runtime/autoload/man.vim | 24 ++++++++++++------------ runtime/plugin/man.vim | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'runtime') diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim index 6c2d4eae8e..072b8a2cd9 100644 --- a/runtime/autoload/man.vim +++ b/runtime/autoload/man.vim @@ -26,7 +26,7 @@ endtry " by the user. count defaults to 0 which is a valid section and " count1 defaults to 1 which is also a valid section. Only when they " are equal was the count explicitly set. -function! man#open_page(count, count1, ...) abort +function! man#open_page(count, count1, mods, ...) abort if a:0 > 2 call s:error('too many arguments') return @@ -56,20 +56,20 @@ function! man#open_page(count, count1, ...) abort endtry call s:push_tag() let bufname = 'man://'.name.(empty(sect)?'':'('.sect.')') - let found_man = s:find_man() - if getbufvar(bufname, 'manwidth') ==# s:manwidth() - if found_man - silent execute 'buf' bufnr(bufname) - else - execute 'split' bufname + if a:mods !~# 'tab' && s:find_man() + if s:manwidth() ==# getbufvar(bufname, 'manwidth') + silent execute 'buf' bufname + keepjumps 1 + return endif - keepjumps 1 + noautocmd execute 'edit' bufname + call s:read_page(sect, name) return endif - if found_man - noautocmd execute 'edit' bufname - else - noautocmd execute 'split' bufname + noautocmd execute a:mods 'split' bufname + if s:manwidth() ==# get(b:, 'manwidth') + keepjumps 1 + return endif call s:read_page(sect, name) endfunction diff --git a/runtime/plugin/man.vim b/runtime/plugin/man.vim index d49276047f..f3fe7151ca 100644 --- a/runtime/plugin/man.vim +++ b/runtime/plugin/man.vim @@ -5,9 +5,9 @@ if exists('g:loaded_man') endif let g:loaded_man = 1 -command! -range=0 -complete=customlist,man#complete -nargs=+ Man call man#open_page(v:count, v:count1, ) +command! -range=0 -complete=customlist,man#complete -nargs=+ Man call man#open_page(v:count, v:count1, , ) -nnoremap (Man) :call man#open_page(v:count, v:count1, &filetype ==# 'man' ? expand('') : expand('')) +nnoremap (Man) :call man#open_page(v:count, v:count1, '', &filetype ==# 'man' ? expand('') : expand('')) augroup man autocmd! -- cgit From 10b014ca7bbf72d68f82803bc58f35127ff904f6 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Fri, 12 Aug 2016 06:07:13 -0400 Subject: man.vim: set window local options when reusing buffer This is necessary incase the buffer was previously opened in a different tab, in which the window options there do not carry over. It is not explicitly documented in ':help local-options' but that is how it works. --- runtime/autoload/man.vim | 11 +++++++++++ runtime/ftplugin/man.vim | 7 +------ 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'runtime') diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim index 072b8a2cd9..349ab1ded5 100644 --- a/runtime/autoload/man.vim +++ b/runtime/autoload/man.vim @@ -59,6 +59,7 @@ function! man#open_page(count, count1, mods, ...) abort if a:mods !~# 'tab' && s:find_man() if s:manwidth() ==# getbufvar(bufname, 'manwidth') silent execute 'buf' bufname + call man#set_window_local_options() keepjumps 1 return endif @@ -68,6 +69,7 @@ function! man#open_page(count, count1, mods, ...) abort endif noautocmd execute a:mods 'split' bufname if s:manwidth() ==# get(b:, 'manwidth') + call man#set_window_local_options() keepjumps 1 return endif @@ -203,6 +205,15 @@ function! s:manwidth() abort return $MANWIDTH endfunction +function! man#set_window_local_options() abort + setlocal nonumber + setlocal norelativenumber + setlocal foldcolumn=0 + setlocal colorcolumn=0 + setlocal nolist + setlocal nofoldenable +endfunction + function! s:man_args(sect, name) abort if empty(a:sect) return shellescape(a:name) diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim index 6a9ad27956..fddfee3c31 100644 --- a/runtime/ftplugin/man.vim +++ b/runtime/ftplugin/man.vim @@ -33,12 +33,7 @@ setlocal tabstop=8 setlocal softtabstop=8 setlocal shiftwidth=8 -setlocal nonumber -setlocal norelativenumber -setlocal foldcolumn=0 -setlocal colorcolumn=0 -setlocal nolist -setlocal nofoldenable +call man#set_window_local_options() if !exists('g:no_plugin_maps') && !exists('g:no_man_maps') nmap (Man) -- cgit From 470883d7054b6145f0c233a8ff3d64db8cd887b9 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Mon, 22 Aug 2016 09:03:37 -0400 Subject: man.vim: slight refactoring Addresses problem one in #5240 --- runtime/autoload/man.vim | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'runtime') diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim index 349ab1ded5..5413037dc3 100644 --- a/runtime/autoload/man.vim +++ b/runtime/autoload/man.vim @@ -1,12 +1,9 @@ " Maintainer: Anmol Sethi -" Ensure Vim is not recursively invoked (man-db does this) -" by forcing man to use cat as the pager. -" More info here http://comments.gmane.org/gmane.editors.vim.devel/29085 if &shell =~# 'fish$' - let s:man_cmd = 'man -P cat ^/dev/null' + let s:man_cmd = 'man ^/dev/null' else - let s:man_cmd = 'man -P cat 2>/dev/null' + let s:man_cmd = 'man 2>/dev/null' endif let s:man_find_arg = "-w" @@ -49,7 +46,7 @@ function! man#open_page(count, count1, mods, ...) abort " user explicitly set a count let sect = string(a:count) endif - let [sect, name] = s:verify_exists(sect, name) + let [sect, name, path] = s:verify_exists(sect, name) catch call s:error(v:exception) return @@ -64,7 +61,7 @@ function! man#open_page(count, count1, mods, ...) abort return endif noautocmd execute 'edit' bufname - call s:read_page(sect, name) + call s:read_page(path) return endif noautocmd execute a:mods 'split' bufname @@ -73,26 +70,29 @@ function! man#open_page(count, count1, mods, ...) abort keepjumps 1 return endif - call s:read_page(sect, name) + call s:read_page(path) endfunction function! man#read_page(ref) abort try let [sect, name] = s:extract_sect_and_name_ref(a:ref) - let [sect, name] = s:verify_exists(sect, name) + " The third element is the path. + call s:read_page(s:verify_exists(sect, name)[2]) catch call s:error(v:exception) return endtry - call s:read_page(sect, name) endfunction -function! s:read_page(sect, name) abort +function! s:read_page(path) abort setlocal modifiable setlocal noreadonly keepjumps %delete _ let b:manwidth = s:manwidth() - silent execute 'read!env MANWIDTH='.b:manwidth s:man_cmd s:man_args(a:sect, a:name) + " Ensure Vim is not recursively invoked (man-db does this) + " by forcing man to use cat as the pager. + " More info here http://comments.gmane.org/gmane.editors.vim.devel/29085 + silent execute 'read!env MANPAGER=cat MANWIDTH='.b:manwidth s:man_cmd a:path " remove all the backspaced text silent execute 'keeppatterns keepjumps %substitute,.\b,,e'.(&gdefault?'':'g') while getline(1) =~# '^\s*$' @@ -136,7 +136,7 @@ function! s:verify_exists(sect, name) abort if a:name =~# '\/' " We do not need to extract the section/name from the path if the name is " just a path. - return ['', a:name] + return ['', a:name, path] endif " We need to extract the section from the path because sometimes " the actual section of the manpage is more specific than the section @@ -144,7 +144,8 @@ function! s:verify_exists(sect, name) abort " Also on linux, it seems that the name is case insensitive. So if one does " ':Man PRIntf', we still want the name of the buffer to be 'printf' or " whatever the correct capitilization is. - return s:extract_sect_and_name_path(path[:len(path)-2]) + let path = path[:len(path)-2] + return s:extract_sect_and_name_path(path) + [path] endfunction let s:tag_stack = [] @@ -282,11 +283,11 @@ function! man#complete(arg_lead, cmd_line, cursor_pos) abort return uniq(sort(map(globpath(s:mandirs,'man?/'.name.'*.'.sect.'*', 0, 1), 's:format_candidate(v:val, sect)'), 'i')) endfunction -function! s:format_candidate(c, sect) abort - if a:c =~# '\.\%(pdf\|in\)$' " invalid extensions +function! s:format_candidate(path, sect) abort + if a:path =~# '\.\%(pdf\|in\)$' " invalid extensions return endif - let [sect, name] = s:extract_sect_and_name_path(a:c) + let [sect, name] = s:extract_sect_and_name_path(a:path) if sect ==# a:sect return name elseif sect =~# a:sect.'[^.]\+$' -- cgit From db2aa27df17742a46f2861a53f8b61826e0318ea Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 24 Aug 2016 14:02:25 -0400 Subject: man.vim: if reusing a buffer, do not use noautocmd The commit that added support for modifiers regressed #5168 causing #5172. This commit fixes it again. --- runtime/autoload/man.vim | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'runtime') diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim index 5413037dc3..968a7dc8f4 100644 --- a/runtime/autoload/man.vim +++ b/runtime/autoload/man.vim @@ -61,14 +61,13 @@ function! man#open_page(count, count1, mods, ...) abort return endif noautocmd execute 'edit' bufname - call s:read_page(path) - return - endif - noautocmd execute a:mods 'split' bufname - if s:manwidth() ==# get(b:, 'manwidth') + elseif s:manwidth() ==# getbufvar(bufname, 'manwidth') + execute a:mods 'split' bufname call man#set_window_local_options() keepjumps 1 return + else + noautocmd execute a:mods 'split' bufname endif call s:read_page(path) endfunction -- cgit