neovim

commit 1ccbaa6c251b6dffa945b4a08043c0626572f6b0
parent 6a6ba5c567e0928668a3b2bc0774a82f665c02ae
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Tue, 14 Oct 2025 10:44:45 +0800

vim-patch:5ffb23c: 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: vim/vim#18566

https://github.com/vim/vim/commit/5ffb23c967189585b74bb9a031caf3b6ef7cce9c

Co-authored-by: Doug Kearns <dougkearns@gmail.com>

Diffstat:
M
runtime/ftplugin/rst.vim
 | 
7
+++++--

1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/runtime/ftplugin/rst.vim b/runtime/ftplugin/rst.vim
@@ -4,6 +4,7 @@
 " Original Maintainer: Nikolai Weibull <now@bitwi.se>
 " 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 <buffer> unlet! b:RstFoldCache
   augroup END
+  let b:undo_ftplugin .= " | setlocal foldexpr< foldmethod< foldtext<"
 endif
 
 let &cpo = s:cpo_save