adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime(tcsh): Update ftplugin (#13327)

Browse Source 
Fix b:browsefilter deletion error when calling b:undo_ftplugin.

Fixes #13167

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
dkearns
2023-10-14 20:27:27 +11:00
committed by GitHub
parent 0f058d1320
commit 7687238e1b
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/ftplugin/csh.vim
View File

@ -3,9 +3,11 @@
" Maintainer: Doug Kearns <dougkearns@gmail.com> " Maintainer: Doug Kearns <dougkearns@gmail.com>
" Previous Maintainer: Dan Sharp " Previous Maintainer: Dan Sharp
" Contributor: Johannes Zellner <johannes@zellner.org> " Contributor: Johannes Zellner <johannes@zellner.org>
" Last Change: 2021 Oct 15 " Last Change: 2023 Oct 09
if exists("b:did_ftplugin") | finish | endif if exists("b:did_ftplugin")
finish
endif
let b:did_ftplugin = 1 let b:did_ftplugin = 1
let s:save_cpo = &cpo let s:save_cpo = &cpo
@ -38,13 +40,14 @@ if exists("loaded_matchit") && !exists("b:match_words")
\ s:line_start .. 'case\s\+:' .. s:line_start .. 'default\>:\<breaksw\>:' .. \ s:line_start .. 'case\s\+:' .. s:line_start .. 'default\>:\<breaksw\>:' ..
\ s:line_start .. 'endsw\>' \ s:line_start .. 'endsw\>'
unlet s:line_start unlet s:line_start
let b:undo_ftplugin ..= " | unlet b:match_words" let b:undo_ftplugin ..= " | unlet! b:match_words"
endif endif
if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
let b:browsefilter = "csh Scripts (*.csh)\t*.csh\n" .. let b:browsefilter = "csh Scripts (*.csh)\t*.csh\n" ..
\ "All Files (*.*)\t*.*\n" \ "All Files (*.*)\t*.*\n"
let b:undo_ftplugin ..= " | unlet b:browsefilter" let b:csh_set_browsefilter = 1
let b:undo_ftplugin ..= " | unlet! b:browsefilter b:csh_set_browsefilter"
endif endif
let &cpo = s:save_cpo let &cpo = s:save_cpo

12
runtime/ftplugin/tcsh.vim
View File

@ -2,9 +2,11 @@
" Language: tcsh " Language: tcsh
" Maintainer: Doug Kearns <dougkearns@gmail.com> " Maintainer: Doug Kearns <dougkearns@gmail.com>
" Previous Maintainer: Dan Sharp " Previous Maintainer: Dan Sharp
" Last Change: 2021 Oct 15 " Last Change: 2023 Oct 09
if exists("b:did_ftplugin") | finish | endif if exists("b:did_ftplugin")
finish
endif
let s:save_cpo = &cpo let s:save_cpo = &cpo
set cpo-=C set cpo-=C
@ -25,11 +27,13 @@ if exists("b:browsefilter")
let s:browsefilter = b:browsefilter let s:browsefilter = b:browsefilter
endif endif
if (has("gui_win32") || has("gui_gtk")) if (has("gui_win32") || has("gui_gtk")) &&
\ (!exists("b:browsefilter") || exists("b:csh_set_browsefilter"))
let b:browsefilter = "tcsh Scripts (*.tcsh)\t*.tcsh\n" .. s:browsefilter let b:browsefilter = "tcsh Scripts (*.tcsh)\t*.tcsh\n" .. s:browsefilter
let s:undo_ftplugin = "unlet! b:browsefilter | " .. s:undo_ftplugin
endif endif
let b:undo_ftplugin = "unlet! b:browsefilter | " .. s:undo_ftplugin let b:undo_ftplugin = s:undo_ftplugin
let &cpo = s:save_cpo let &cpo = s:save_cpo
unlet s:save_cpo unlet s:save_cpo