From 5f8fac00bf48fa7afbdddd2a96d7cc81cc2ed893 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Fri, 20 Dec 2024 19:58:00 +0100 Subject: vim-patch:70881ba: runtime(dockerfile): do not set commentstring in syntax script fixes: vim/vim#16268 https://github.com/vim/vim/commit/70881ba195d267d01df912294ddc5b5d525bba3d Co-authored-by: Christian Brabandt --- runtime/ftplugin/dockerfile.vim | 6 +++--- runtime/syntax/dockerfile.vim | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'runtime') diff --git a/runtime/ftplugin/dockerfile.vim b/runtime/ftplugin/dockerfile.vim index 2e3c447b59..e45bf4c1d8 100644 --- a/runtime/ftplugin/dockerfile.vim +++ b/runtime/ftplugin/dockerfile.vim @@ -1,7 +1,7 @@ " Vim filetype plugin " Language: Dockerfile " Maintainer: Honza Pokorny -" Last Change: 2014 Aug 29 +" Last Change: 2024 Dec 20 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -11,6 +11,6 @@ endif " Don't load another plugin for this buffer let b:did_ftplugin = 1 -let b:undo_ftplugin = "setl commentstring<" - setlocal commentstring=#\ %s + +let b:undo_ftplugin = "setl commentstring<" diff --git a/runtime/syntax/dockerfile.vim b/runtime/syntax/dockerfile.vim index 6ec71fcdb6..f1d612f4ad 100644 --- a/runtime/syntax/dockerfile.vim +++ b/runtime/syntax/dockerfile.vim @@ -1,6 +1,6 @@ " dockerfile.vim - Syntax highlighting for Dockerfiles " Maintainer: Honza Pokorny -" Last Change: 2024 Jul 03 +" Last Change: 2024 Dec 20 " License: BSD " https://docs.docker.com/engine/reference/builder/ @@ -35,7 +35,6 @@ syntax region dockerfileShell contained keepend start=/\v/ skip=/\v\\\_./ end=/ syntax region dockerfileValue contained keepend start=/\v/ skip=/\v\\\_./ end=/\v$/ contains=dockerfileString syntax region dockerfileComment start=/\v^\s*#/ end=/\v$/ contains=@Spell -set commentstring=#\ %s hi def link dockerfileString String hi def link dockerfileKeyword Keyword -- cgit