aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2024-09-24 09:38:59 +0200
committerChristian Clason <c.clason@uni-graz.at>2024-09-24 09:55:43 +0200
commit2276743cb8e13483ba15695ef0a1ea65263e825f (patch)
treea1fd1c815ba48df8c6f5aad2c3ba4c9d46c1f8ae
parentd831392b156087ddc38eb75b0260c03f955dd23c (diff)
downloadrneovim-2276743cb8e13483ba15695ef0a1ea65263e825f.tar.gz
rneovim-2276743cb8e13483ba15695ef0a1ea65263e825f.tar.bz2
rneovim-2276743cb8e13483ba15695ef0a1ea65263e825f.zip
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 <john.m.devin@gmail.com>
-rw-r--r--runtime/ftplugin/rmd.vim8
-rw-r--r--runtime/ftplugin/rrst.vim8
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 <jalvesaq@gmail.com>
" 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 <jalvesaq@gmail.com>
" 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