commit c81ff490dce22e31d63d74f2955f29eecf0b11a3
parent d8f29f7e7ddabcc2566529f3c93f1fefa5ffda4a
Author: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 4 Dec 2025 08:50:50 +0800
vim-patch:ffc7f8c: runtime(hog): set undo_ftplugin correctly, delete trailing whitespace
closes: vim/vim#18727
https://github.com/vim/vim/commit/ffc7f8c9dac67cce6c020e8c4158972e2a88ce24
Co-authored-by: D. Ben Knoble <ben.knoble+github@gmail.com>
Diffstat:
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/runtime/ftplugin/hog.vim b/runtime/ftplugin/hog.vim
@@ -2,13 +2,14 @@
" Language: hog (snort.conf)
" Maintainer: . Victor Roemer, <vroemer@badsec.org>.
" Last Change: Mar 1, 2013
+" 2025 Dec 03 by Vim Project: set undo_ftplugin correctly #18727
if exists("b:did_ftplugin")
finish
endif
let b:did_ftplugin = 1
-let s:undo_ftplugin = "setl fo< com< cms< def< inc<"
+let b:undo_ftplugin = "setl fo< com< cms< def< inc<"
let s:cpo_save = &cpo
set cpo&vim
@@ -19,8 +20,8 @@ setlocal commentstring=\c#\ %s
setlocal define=\c^\s\{-}var
setlocal include=\c^\s\{-}include
-" Move around configurations
-let s:hog_keyword_match = '\c^\s*\<\(preprocessor\\|config\\|output\\|include\\|ipvar\\|portvar\\|var\\|dynamicpreprocessor\\|' .
+" Move around configurations
+let s:hog_keyword_match = '\c^\s*\<\(preprocessor\\|config\\|output\\|include\\|ipvar\\|portvar\\|var\\|dynamicpreprocessor\\|' .
\ 'dynamicengine\\|dynamicdetection\\|activate\\|alert\\|drop\\|block\\|dynamic\\|log\\|pass\\|reject\\|sdrop\\|sblock\)\>'
exec "nnoremap <buffer><silent> ]] :call search('" . s:hog_keyword_match . "', 'W' )<CR>"
@@ -28,9 +29,9 @@ exec "nnoremap <buffer><silent> [[ :call search('" . s:hog_keyword_match . "', '
if exists("loaded_matchit")
let b:match_words =
- \ '^\s*\<\%(preprocessor\|config\|output\|include\|ipvar\|portvar' .
- \ '\|var\|dynamicpreprocessor\|dynamicengine\|dynamicdetection' .
- \ '\|activate\|alert\|drop\|block\|dynamic\|log\|pass\|reject' .
+ \ '^\s*\<\%(preprocessor\|config\|output\|include\|ipvar\|portvar' .
+ \ '\|var\|dynamicpreprocessor\|dynamicengine\|dynamicdetection' .
+ \ '\|activate\|alert\|drop\|block\|dynamic\|log\|pass\|reject' .
\ '\|sdrop\|sblock\>\):$,\::\,:;'
let b:match_skip = 'r:\\.\{-}$\|^\s*#.\{-}$\|^\s*$'
endif