aboutsummaryrefslogtreecommitdiff
path: root/runtime/ftplugin
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-05-01 14:23:09 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-05-01 22:29:02 -0400
commit330500a5bfb1207e0c9eb79ac27fb8244da93ce0 (patch)
treebf830508b9063636dbbb064175ade5f2b7996bf9 /runtime/ftplugin
parentb16c7c515c34d2f695a595527594325abc6a640b (diff)
downloadrneovim-330500a5bfb1207e0c9eb79ac27fb8244da93ce0.tar.gz
rneovim-330500a5bfb1207e0c9eb79ac27fb8244da93ce0.tar.bz2
rneovim-330500a5bfb1207e0c9eb79ac27fb8244da93ce0.zip
vim-patch:cb80aa2d53e5
Update runtime files. https://github.com/vim/vim/commit/cb80aa2d53e56d3aba3b3c439fb467f29a750c5e Omit runtime/doc/tabpage.txt. Patch v8.2.1401 is not ported yet. Port optwin.vim changes without gettext(). Patch v8.2.1544 is not ported yet.
Diffstat (limited to 'runtime/ftplugin')
-rw-r--r--runtime/ftplugin/erlang.vim4
-rw-r--r--runtime/ftplugin/make.vim6
-rw-r--r--runtime/ftplugin/rpl.vim2
3 files changed, 6 insertions, 6 deletions
diff --git a/runtime/ftplugin/erlang.vim b/runtime/ftplugin/erlang.vim
index 2bbc345b43..ece11d7249 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 bfa8703082..168bc38eb3 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 @@ if exists("b:did_ftplugin")
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/rpl.vim b/runtime/ftplugin/rpl.vim
index 909e141cc6..8b4d5b0d48 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