Update runtime files.
diff --git a/runtime/ftplugin/erlang.vim b/runtime/ftplugin/erlang.vim
index 2bbc345..ece11d7 100644
--- a/runtime/ftplugin/erlang.vim
+++ b/runtime/ftplugin/erlang.vim
@@ -1,7 +1,7 @@
" Vim ftplugin file
" Language: Erlang
-" Author: Oscar Hellström <oscar@oscarh.net>
-" Contributors: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
+" Author: Oscar Hellström <oscar@oscarh.net>
+" Contributors: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
" Eduardo Lopez (http://github.com/tapichu)
" License: Vim license
" Version: 2012/01/25
diff --git a/runtime/ftplugin/make.vim b/runtime/ftplugin/make.vim
index bfa8703..168bc38 100644
--- a/runtime/ftplugin/make.vim
+++ b/runtime/ftplugin/make.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: Make
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2019 Apr 02
+" Last Change: 2020 Oct 16
" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -9,10 +9,10 @@
endif
let b:did_ftplugin = 1
-let b:undo_ftplugin = "setl et< sts< fo< com< cms< inc<"
+let b:undo_ftplugin = "setl et< sts< sw< fo< com< cms< inc<"
" Make sure a hard tab is used, required for most make programs
-setlocal noexpandtab softtabstop=0
+setlocal noexpandtab softtabstop=0 shiftwidth=0
" Set 'formatoptions' to break comment lines but not other lines,
" and insert the comment leader when hitting <CR> or using "o".
diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim
index 5f8a639..e62637a 100644
--- a/runtime/ftplugin/man.vim
+++ b/runtime/ftplugin/man.vim
@@ -2,7 +2,7 @@
" Language: man
" Maintainer: Jason Franklin <vim@justemail.net>
" Maintainer: SungHyun Nam <goweol@gmail.com>
-" Last Change: 2020 Jun 01
+" Last Change: 2020 Oct 09
" To make the ":Man" command available before editing a manual page, source
" this script from your startup vimrc file.
@@ -76,7 +76,7 @@
" Ignore the error in restricted mode
endtry
-func <SID>PreGetPage(cnt)
+func s:PreGetPage(cnt)
if a:cnt == 0
let old_isk = &iskeyword
if &ft == 'man'
@@ -99,24 +99,27 @@
call s:GetPage('', sect, page)
endfunc
-func <SID>GetCmdArg(sect, page)
- if a:sect == ''
- return a:page
+func s:GetCmdArg(sect, page)
+
+ if empty(a:sect)
+ return shellescape(a:page)
endif
- return s:man_sect_arg.' '.a:sect.' '.a:page
+
+ return s:man_sect_arg . ' ' . shellescape(a:sect) . ' ' . shellescape(a:page)
endfunc
-func <SID>FindPage(sect, page)
- let where = system("man ".s:man_find_arg.' '.s:GetCmdArg(a:sect, a:page))
- if where !~ "^/"
- if matchstr(where, " [^ ]*$") !~ "^ /"
- return 0
- endif
+func s:FindPage(sect, page)
+ let l:cmd = printf('man %s %s', s:man_find_arg, s:GetCmdArg(a:sect, a:page))
+ call system(l:cmd)
+
+ if v:shell_error
+ return 0
endif
+
return 1
endfunc
-func <SID>GetPage(cmdmods, ...)
+func s:GetPage(cmdmods, ...)
if a:0 >= 2
let sect = a:1
let page = a:2
@@ -226,7 +229,7 @@
setl noma
endfunc
-func <SID>PopPage()
+func s:PopPage()
if s:man_tag_depth > 0
let s:man_tag_depth = s:man_tag_depth - 1
exec "let s:man_tag_buf=s:man_tag_buf_".s:man_tag_depth
diff --git a/runtime/ftplugin/rpl.vim b/runtime/ftplugin/rpl.vim
index 909e141..8b4d5b0 100644
--- a/runtime/ftplugin/rpl.vim
+++ b/runtime/ftplugin/rpl.vim
@@ -1,6 +1,6 @@
" Vim filetype plugin file
" Language: RPL/2
-" Maintainer: Joël BERTRAND <rpl2@free.fr>
+" Maintainer: Joël BERTRAND <rpl2@free.fr>
" Last Change: 2012 Mar 07
" Version: 0.1