From 2276743cb8e13483ba15695ef0a1ea65263e825f Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Tue, 24 Sep 2024 09:38:59 +0200 Subject: [PATCH] vim-patch:a7229c8: runtime(rmd,rrst): 'fex' option not properly restored Add 'fex' to b:undo_ftplugin variable closes: vim/vim#15728 https://github.com/vim/vim/commit/a7229c8a99129608e9d651441cca6e6d3079ef56 Co-authored-by: John M Devin --- runtime/ftplugin/rmd.vim | 8 +++++--- runtime/ftplugin/rrst.vim | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/runtime/ftplugin/rmd.vim b/runtime/ftplugin/rmd.vim index a537017aad..2390ab1cb9 100644 --- a/runtime/ftplugin/rmd.vim +++ b/runtime/ftplugin/rmd.vim @@ -3,7 +3,9 @@ " Maintainer: This runtime file is looking for a new maintainer. " Former Maintainer: Jakson Alves de Aquino " Former Repository: https://github.com/jalvesaq/R-Vim-runtime -" Last Change: 2024 Feb 28 by Vim Project +" Last Change: +" 2024 Feb 28 by Vim Project +" 2024 Sep 23 by Vim Project: properly restore fex option " Original work by Alex Zvoleff (adjusted from R help for rmd by Michel Kuhlmann) " Only do this when not yet done for this buffer @@ -74,9 +76,9 @@ if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") endif if exists('b:undo_ftplugin') - let b:undo_ftplugin .= " | setl cms< com< fo< flp< isk< | unlet! b:browsefilter" + let b:undo_ftplugin .= " | setl cms< com< fo< flp< isk< fex< | unlet! b:browsefilter" else - let b:undo_ftplugin = "setl cms< com< fo< flp< isk< | unlet! b:browsefilter" + let b:undo_ftplugin = "setl cms< com< fo< flp< isk< fex< | unlet! b:browsefilter" endif let &cpo = s:cpo_save diff --git a/runtime/ftplugin/rrst.vim b/runtime/ftplugin/rrst.vim index d088f98224..73ebb75fea 100644 --- a/runtime/ftplugin/rrst.vim +++ b/runtime/ftplugin/rrst.vim @@ -3,7 +3,9 @@ " Maintainer: This runtime file is looking for a new maintainer. " Former Maintainer: Jakson Alves de Aquino " Former Repository: https://github.com/jalvesaq/R-Vim-runtime -" Last Change: 2024 Feb 28 by Vim Project +" Last Change: +" 2024 Feb 28 by Vim Project +" 2024 Sep 23 by Vim Project: properly restore fex option " Original work by Alex Zvoleff " Only do this when not yet done for this buffer @@ -48,9 +50,9 @@ if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") endif if exists('b:undo_ftplugin') - let b:undo_ftplugin .= " | setl cms< com< fo< flp< isk< | unlet! b:browsefilter" + let b:undo_ftplugin .= " | setl cms< com< fo< flp< isk< fex< | unlet! b:browsefilter" else - let b:undo_ftplugin = "setl cms< com< fo< flp< isk< | unlet! b:browsefilter" + let b:undo_ftplugin = "setl cms< com< fo< flp< isk< fex< | unlet! b:browsefilter" endif let &cpo = s:cpo_save