From 5ffb23c967189585b74bb9a031caf3b6ef7cce9c Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Mon, 13 Oct 2025 18:34:47 +0000 Subject: [PATCH] runtime(rst): Update b:undo_ftplugin variable The value of this variable is evaluated when the 'filetype' option is changed and should be a command string that will undo any configuration changes that the plugin has made. See :help undo_indent for details related: #18566 Signed-off-by: Doug Kearns Signed-off-by: Marshall Ward Signed-off-by: Christian Brabandt --- runtime/ftplugin/rst.vim | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/runtime/ftplugin/rst.vim b/runtime/ftplugin/rst.vim index c88e8f2580..887f64bb4c 100644 --- a/runtime/ftplugin/rst.vim +++ b/runtime/ftplugin/rst.vim @@ -4,6 +4,7 @@ " Original Maintainer: Nikolai Weibull " Website: https://github.com/marshallward/vim-restructuredtext " Latest Revision: 2020-03-31 +" 2025 Oct 13 by Vim project: update b:undo_ftplugin #18566 if exists("b:did_ftplugin") finish @@ -18,7 +19,7 @@ if !exists('g:rst_fold_enabled') let g:rst_fold_enabled = 0 endif -let b:undo_ftplugin = "setl com< cms< et< fo<" +let b:undo_ftplugin = "setlocal comments< commentstring< expandtab< formatoptions<" setlocal comments=fb:.. commentstring=..\ %s expandtab setlocal formatoptions+=tcroql @@ -32,15 +33,17 @@ setlocal formatoptions+=tcroql if exists("g:rst_style") && g:rst_style != 0 setlocal expandtab shiftwidth=3 softtabstop=3 tabstop=8 + let b:undo_ftplugin .= " | setlocal softtabstop< shiftwidth< tabstop<" endif -if g:rst_fold_enabled != 0 && has('patch-7.3.867') " Introduced the TextChanged event. +if g:rst_fold_enabled != 0 setlocal foldmethod=expr setlocal foldexpr=RstFold#GetRstFold() setlocal foldtext=RstFold#GetRstFoldText() augroup RstFold autocmd TextChanged,InsertLeave unlet! b:RstFoldCache augroup END + let b:undo_ftplugin .= " | setlocal foldexpr< foldmethod< foldtext<" endif let &cpo = s:cpo_save