diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-09-27 19:34:08 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-09-27 19:34:08 +0200 |
| commit | 5be4ceecea5520265066eac972460ebb1cdf05e7 (patch) | |
| tree | 818c9471879de5c5fb956c21f125cc8de9a42341 /runtime/ftplugin | |
| parent | a7f6c3cf071bb6267e0bd2eb3d27ca240381ba87 (diff) | |
Update runtime files.
Diffstat (limited to 'runtime/ftplugin')
| -rw-r--r-- | runtime/ftplugin/bash.vim | 19 | ||||
| -rw-r--r-- | runtime/ftplugin/man.vim | 14 | ||||
| -rw-r--r-- | runtime/ftplugin/matlab.vim | 5 |
3 files changed, 17 insertions, 21 deletions
diff --git a/runtime/ftplugin/bash.vim b/runtime/ftplugin/bash.vim index a3d01fc2ad..7bd9787b6c 100644 --- a/runtime/ftplugin/bash.vim +++ b/runtime/ftplugin/bash.vim @@ -11,21 +11,10 @@ if exists("b:did_ftplugin") finish endif +unlet! b:is_sh +unlet! b:is_kornshell let b:is_bash = 1 -if exists("b:is_sh") - unlet b:is_sh -endif -if exists("b:is_kornshell") - unlet b:is_kornshell -endif -" Setting 'filetype' here directly won't work, since we are being invoked -" through an autocommand. Do it later, on the BufWinEnter event. -augroup bash_filetype - au BufWinEnter * call SetBashFt() -augroup END +runtime! ftplugin/sh.vim ftplugin/sh_*.vim ftplugin/sh/*.vim -func SetBashFt() - au! bash_filetype - set ft=sh -endfunc +" vim: ts=8 diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim index 4591c478d9..cbace44c14 100644 --- a/runtime/ftplugin/man.vim +++ b/runtime/ftplugin/man.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: man " Maintainer: SungHyun Nam <goweol@gmail.com> -" Last Change: 2019 Jul 22 +" Last Change: 2019 Sep 26 " (fix by Jason Franklin) " To make the ":Man" command available before editing a manual page, source @@ -132,11 +132,17 @@ func <SID>GetPage(cmdmods, ...) let page = expand('<cword>') endif - if sect != "" && s:FindPage(sect, page) == 0 - let sect = "" + if !exists('g:ft_man_no_sect_fallback') || (g:ft_man_no_sect_fallback == 0) + if sect != "" && s:FindPage(sect, page) == 0 + let sect = "" + endif endif if s:FindPage(sect, page) == 0 - echo "\nCannot find a '".page."'." + let msg = "\nNo manual entry for ".page + if sect != "" + let msg .= " in section ".sect + endif + echo msg return endif exec "let s:man_tag_buf_".s:man_tag_depth." = ".bufnr("%") diff --git a/runtime/ftplugin/matlab.vim b/runtime/ftplugin/matlab.vim index 205111c3c2..a1a282f19e 100644 --- a/runtime/ftplugin/matlab.vim +++ b/runtime/ftplugin/matlab.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: matlab " Maintainer: Jake Wasserman <jwasserman at gmail dot com> -" Last Changed: 2014 Dec 30 +" Last Change: 2019 Sep 27 " Contributors: " Charles Campbell @@ -24,8 +24,9 @@ endif setlocal suffixesadd=.m setlocal suffixes+=.asv +setlocal commentstring=%\ %s -let b:undo_ftplugin = "setlocal suffixesadd< suffixes< " +let b:undo_ftplugin = "setlocal suffixesadd< suffixes< commentstring< " \ . "| unlet! b:match_words" let &cpo = s:save_cpo |