Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
/vimPublic

Commit25a736e

Browse files
bruhtuschrisbra
authored andcommitted
runtime(i3config/swayconfig): add all option for i3config only
Since i3 version 4.24, popup_during_fullscreen has newoption `all`. So add the `all` option for popup_during_fullscreen toprevent `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 swayconfigsyntax script after sourcing the i3config.Reference:-https://i3wm.org/docs/userguide.html#_popups_during_fullscreen_mode-swaywm/sway#8746closes:#18760Signed-off-by: Robertus Chris <robertusdchris@gmail.com>Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent0e1ab0a commit25a736e

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

‎runtime/syntax/i3config.vim‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
" Vim syntax file
22
" Language: i3 config file
3-
" Original Author: Josef Litos (JosefLitos/i3config.vim)
3+
" Original Author: Josef Litos (litoj/i3config.vim)
44
" Maintainer: Quentin Hibon (github user hiqua)
5-
" Version: 1.2.4
6-
" Last Change:2024-05-24
5+
" Version: 1.2.5
6+
" Last Change:2025-11-24
77

88
" References:
99
" http://i3wm.org/docs/userguide.html#configuring
@@ -151,7 +151,9 @@ syn keyword i3ConfigKeyword mouse_warping contained skipwhite nextgroup=i3Config
151151

152152
" 4.26 Popups while fullscreen
153153
synkeywordi3ConfigPopupFullscreenOpts smart ignore leave_fullscreencontained
154-
synkeywordi3ConfigKeyword popup_during_fullscreencontainedskipwhitenextgroup=i3ConfigPopupFullscreenOpts
154+
synkeywordi3ConfigPopupFullscreenOptsExtra allcontained
155+
synclusteri3ConfigPopupFullscreenOptscontains=i3ConfigPopupFullscreenOpts,i3ConfigPopupFullscreenOptsExtra
156+
synkeywordi3ConfigKeyword popup_during_fullscreencontainedskipwhitenextgroup=@i3ConfigPopupFullscreenOpts
155157

156158
" 4.27 Focus wrapping
157159
synkeywordi3ConfigFocusWrappingOpts force workspacecontained
@@ -311,6 +313,7 @@ hi def link i3ConfigClientOpts i3ConfigOption
311313
hideflinki3ConfigFocusFollowsMouseOptsi3ConfigOption
312314
hideflinki3ConfigMouseWarpingOptsi3ConfigOption
313315
hideflinki3ConfigPopupFullscreenOptsi3ConfigOption
316+
hideflinki3ConfigPopupFullscreenOptsExtrai3ConfigPopupFullscreenOpts
314317
hideflinki3ConfigFocusWrappingOptsi3ConfigOption
315318
hideflinki3ConfigTimeUniti3ConfigNumber
316319
hideflinki3ConfigFocusOnActivationOptsi3ConfigOption

‎runtime/syntax/swayconfig.vim‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
" Vim syntax file
22
" Language: sway config file
3-
" Original Author: Josef Litos (JosefLitos/i3config.vim)
3+
" Original Author: Josef Litos (litoj/i3config.vim)
44
" Maintainer: James Eapen <james.eapen@vai.org>
5-
" Version: 1.2.4
6-
" Last Change:2024 Oct 17
5+
" Version: 1.2.6
6+
" Last Change:2025 Nov 24
77
" 2025 Sep 23 by Vim Project update swayconfig syntax #18293
88

99
" References:
@@ -22,6 +22,9 @@ syn cluster i3ConfigCommand contains=i3ConfigCommand,i3ConfigAction,i3ConfigActi
2222

2323
runtime!syntax/i3config.vim
2424

25+
" In sway, popup_during_fullscreen does not have options like all option.
26+
synclusteri3ConfigPopupFullscreenOptsremove=i3ConfigPopupFullscreenOptsExtra
27+
2528
" Sway extensions to i3
2629
synkeywordi3ConfigActionKeyword opacity urgent shortcuts_inhibitor splitv splith splittcontainedcontainedskipwhitenextgroup=i3ConfigOption
2730
synkeywordi3ConfigOption set plus minus allow deny csd v h tcontainedcontainedskipwhitenextgroup=i3ConfigOption,@i3ConfigValue

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp