From: Robertus Chris Date: Wed, 26 Nov 2025 20:37:09 +0000 (+0000) Subject: runtime(i3config/swayconfig): add all option for i3config only X-Git-Tag: v9.1.1930~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25a736e323af9f5d22b3710ea9535a1a0dcf9a17;p=thirdparty%2Fvim.git runtime(i3config/swayconfig): add all option for i3config only Since i3 version 4.24, popup_during_fullscreen has new option `all`. So add the `all` option for popup_during_fullscreen to prevent `all` option highlighted as error. However, sway won't implement `all` option for popup_during_fullscreen, so let's remove the extra options from the syntax cluster in swayconfig syntax script after sourcing the i3config. Reference: - https://i3wm.org/docs/userguide.html#_popups_during_fullscreen_mode - https://github.com/swaywm/sway/issues/8746 closes: #18760 Signed-off-by: Robertus Chris Signed-off-by: Christian Brabandt --- diff --git a/runtime/syntax/i3config.vim b/runtime/syntax/i3config.vim index c95cb879ad..cf40b050a9 100644 --- a/runtime/syntax/i3config.vim +++ b/runtime/syntax/i3config.vim @@ -1,9 +1,9 @@ " Vim syntax file " Language: i3 config file -" Original Author: Josef Litos (JosefLitos/i3config.vim) +" Original Author: Josef Litos (litoj/i3config.vim) " Maintainer: Quentin Hibon (github user hiqua) -" Version: 1.2.4 -" Last Change: 2024-05-24 +" Version: 1.2.5 +" Last Change: 2025-11-24 " References: " http://i3wm.org/docs/userguide.html#configuring @@ -151,7 +151,9 @@ syn keyword i3ConfigKeyword mouse_warping contained skipwhite nextgroup=i3Config " 4.26 Popups while fullscreen syn keyword i3ConfigPopupFullscreenOpts smart ignore leave_fullscreen contained -syn keyword i3ConfigKeyword popup_during_fullscreen contained skipwhite nextgroup=i3ConfigPopupFullscreenOpts +syn keyword i3ConfigPopupFullscreenOptsExtra all contained +syn cluster i3ConfigPopupFullscreenOpts contains=i3ConfigPopupFullscreenOpts,i3ConfigPopupFullscreenOptsExtra +syn keyword i3ConfigKeyword popup_during_fullscreen contained skipwhite nextgroup=@i3ConfigPopupFullscreenOpts " 4.27 Focus wrapping syn keyword i3ConfigFocusWrappingOpts force workspace contained @@ -311,6 +313,7 @@ hi def link i3ConfigClientOpts i3ConfigOption hi def link i3ConfigFocusFollowsMouseOpts i3ConfigOption hi def link i3ConfigMouseWarpingOpts i3ConfigOption hi def link i3ConfigPopupFullscreenOpts i3ConfigOption +hi def link i3ConfigPopupFullscreenOptsExtra i3ConfigPopupFullscreenOpts hi def link i3ConfigFocusWrappingOpts i3ConfigOption hi def link i3ConfigTimeUnit i3ConfigNumber hi def link i3ConfigFocusOnActivationOpts i3ConfigOption diff --git a/runtime/syntax/swayconfig.vim b/runtime/syntax/swayconfig.vim index 6da4c6e51a..d7a02bf32f 100644 --- a/runtime/syntax/swayconfig.vim +++ b/runtime/syntax/swayconfig.vim @@ -1,9 +1,9 @@ " Vim syntax file " Language: sway config file -" Original Author: Josef Litos (JosefLitos/i3config.vim) +" Original Author: Josef Litos (litoj/i3config.vim) " Maintainer: James Eapen -" Version: 1.2.4 -" Last Change: 2024 Oct 17 +" Version: 1.2.6 +" Last Change: 2025 Nov 24 " 2025 Sep 23 by Vim Project update swayconfig syntax #18293 " References: @@ -22,6 +22,9 @@ syn cluster i3ConfigCommand contains=i3ConfigCommand,i3ConfigAction,i3ConfigActi runtime! syntax/i3config.vim +" In sway, popup_during_fullscreen does not have options like all option. +syn cluster i3ConfigPopupFullscreenOpts remove=i3ConfigPopupFullscreenOptsExtra + " Sway extensions to i3 syn keyword i3ConfigActionKeyword opacity urgent shortcuts_inhibitor splitv splith splitt contained contained skipwhite nextgroup=i3ConfigOption syn keyword i3ConfigOption set plus minus allow deny csd v h t contained contained skipwhite nextgroup=i3ConfigOption,@i3ConfigValue