runtime(sql, mysql): fix E169: Command too recursive with sql_type_default = "mysql"
Commit: https://github.com/vim/vim/commit/fc762dfc9fa95696409067bcb565e846c9ccfc5a Author: Yinzuo Jiang <jiangyin...@foxmail.com> Date: Wed Aug 14 21:49:00 2024 +0200 runtime(sql, mysql): fix E169: Command too recursive with sql_type_default = "mysql" Problem: When setting "let g:sql_type_default = "mysql", editing .sql file reports "E169: Command too recursive" error Solution: - Add 'let b:did_ftplugin = 1' at the top of ftplugin/sql.vim - Add 'if exists("b:did_ftplugin") | finish | endif' in ftplugin/mysql.vim - Add missing header information in ftplugin/mysql.vim - Remove redundant code in ftplugin/sql.vim fixes: #15474 closes: #15475 Signed-off-by: Yinzuo Jiang <jiangyin...@foxmail.com> Signed-off-by: Riley Bruins <ribr...@hotmail.com> Signed-off-by: Christian Brabandt <c...@256bit.org> diff --git a/runtime/ftplugin/mysql.vim b/runtime/ftplugin/mysql.vim index cbbd0eb12..232df8c5a 100644 --- a/runtime/ftplugin/mysql.vim +++ b/runtime/ftplugin/mysql.vim @@ -1 +1,9 @@ +" Vim filetype plugin +" Language: MySQL +" Maintainer: Riley Bruins <ribr...@gmail.com> +" Last Change: 2024 Aug 12 +if exists("b:did_ftplugin") + finish +endif + runtime ftplugin/sql.vim diff --git a/runtime/ftplugin/sql.vim b/runtime/ftplugin/sql.vim index 61b7e6725..3b56acd67 100644 --- a/runtime/ftplugin/sql.vim +++ b/runtime/ftplugin/sql.vim @@ -3,8 +3,9 @@ " Version: 12.0 " Maintainer: David Fishburn <dfishburn dot vim at gmail dot com> " Last Change: 2017 Mar 07 -" 2024 Jan 14 by Vim Project (browsefilter) -" 2024 May 18 by Vim Project (set comment options) +" 2024 Jan 14 by Vim Project: browsefilter +" 2024 May 18 by Vim Project: set comment options +" 2024 Aug 14 by Vim Project: remove redundant code " Download: http://vim.sourceforge.net/script.php?script_id=454 " For more details please use: @@ -92,13 +93,19 @@ " Only do this when not done yet for this buffer " This ftplugin can be used with other ftplugins. So ensure loading " happens if all elements of this plugin have not yet loaded. -if exists("b:did_ftplugin") && exists("b:current_ftplugin") && b:current_ftplugin == 'sql' +if exists("b:did_ftplugin") finish endif +" Don't load another plugin for this buffer +let b:did_ftplugin = 1 + let s:save_cpo = &cpo set cpo&vim +let b:undo_ftplugin = "setl comments< commentstring< formatoptions< define< omnifunc<" . + \ " | unlet! b:browsefilter b:match_words" + " Disable autowrapping for code, but enable for comments " t Auto-wrap text using textwidth " c Auto-wrap comments using textwidth, inserting the current comment @@ -263,19 +270,6 @@ elseif exists("g:sql_type_default") endif endif -" If the above runtime command succeeded, do not load the default settings -" as they should have already been loaded from a previous run. -if exists("b:did_ftplugin") && exists("b:current_ftplugin") && b:current_ftplugin == 'sql' - finish -endif - -let b:undo_ftplugin = "setl comments< commentstring< formatoptions< define< omnifunc<" . - \ " | unlet! b:browsefilter b:match_words" - -" Don't load another plugin for this buffer -let b:did_ftplugin = 1 -let b:current_ftplugin = 'sql' - " Win32 and GTK can filter files in the browse dialog if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") let b:browsefilter = "SQL Files (*.sql) *.sql " -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/E1seKAB-001cle-Ff%40256bit.org.
