From 6a8436065ca7282569fd4d96b1c02a8ba8eaacf1 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sun, 2 May 2021 10:19:25 -0400 Subject: vim-patch:9faec4e3d439 Update runtime files. https://github.com/vim/vim/commit/9faec4e3d439968e21ad74e917aebb289df8f849 Omit vim9. --- runtime/ftplugin/lisp.vim | 4 +--- runtime/ftplugin/vim.vim | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'runtime/ftplugin') diff --git a/runtime/ftplugin/lisp.vim b/runtime/ftplugin/lisp.vim index 130f30b146..9825d2484a 100644 --- a/runtime/ftplugin/lisp.vim +++ b/runtime/ftplugin/lisp.vim @@ -14,13 +14,11 @@ endif " Don't load another plugin for this buffer let b:did_ftplugin = 1 -setl comments=:; +setl comments=:;;;;,:;;;,:;;,:;,sr:#\|,mb:\|,ex:\|# setl define=^\\s*(def\\k* setl formatoptions-=t setl iskeyword+=+,-,*,/,%,<,=,>,:,$,?,!,@-@,94 setl lisp setl commentstring=;%s -setl comments^=:;;;,:;;,sr:#\|,mb:\|,ex:\|# - let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lisp< commentstring<" diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim index a842114433..61fabcbb32 100644 --- a/runtime/ftplugin/vim.vim +++ b/runtime/ftplugin/vim.vim @@ -1,7 +1,7 @@ " Vim filetype plugin " Language: Vim " Maintainer: Bram Moolenaar -" Last Change: 2021 Feb 07 +" Last Change: 2021 Feb 20 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -55,7 +55,7 @@ if "\n" .. join(getline(1, 10), "\n") =~# '\n\s*vim9\%[script]\>' " Comments starts with # in Vim9 script setlocal commentstring=#%s else - setlocal com=sO:\"\ -,mO:\"\ \ ,:\" + setlocal com=sO:\"\ -,mO:\"\ \ ,eO:\"\",:\" " Comments starts with a double quote in legacy script setlocal commentstring=\"%s endif -- cgit