Skip to content

Commit 4338bbf

Browse files
committed
main: update workaround for Ghostty
1 parent 2a0c6ba commit 4338bbf

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

ble.pp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2667,12 +2667,14 @@ function ble/base/attach/.needs-prompt-attach {
26672667
# unset after the initialization. If we find it, we cancel the manual
26682668
# attaching and switch to the prompt attach.
26692669
ext=0
2670-
elif [[ ${ghostty_bash_inject-} ]]; then
2670+
elif [[ ${ghostty_bash_inject-} || ${__ghostty_bash_flags-} ]]; then
26712671
# Ghostty seems to use a shell-integration code derived from kitty's. By
26722672
# the way, kitty is licensed under GPL-3.0, while Ghostty is licensed under
26732673
# the MIT license. Is it allowed to include a derivative of a part of
26742674
# kitty in the MIT-licensed Ghostty? It may be non-trivial whether the
26752675
# shell integration is an essential part of Ghostty.
2676+
# Note: Ghostty has updated the variable name on 2025-01-17 from
2677+
# "ghostty_bash_inject" to "__ghostty_bash_flags".
26762678
ext=0
26772679
fi
26782680

docs/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@
214214
- complete: work around `mawk <= 1.3.4-20230525` type-inference bug (reported by KaKi87) `#D2295` 546499b5
215215
- main: work around macOS sed (reported by Mossop) `#D2298` a16aa594
216216
- main: delay attaching in kitty, Ghostty, and VS Code Terminal `#D2215` 430a1746
217+
- main: update workaround for Ghostty (reported by odili) `#D2322` xxxxxxxx
217218
- edit: adjust cursor position after `bind -x` in vi_nmap (requested by miltieIV2) `#D2317` 36ab934f
218219
- progcomp: update workaround for the dnf completion (reported by msr8) `#D2321` xxxxxxxx
219220

note.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7737,6 +7737,13 @@ bash_tips
77377737

77387738
2025-02-09
77397739

7740+
* main (ble-attach): workaround for Ghostty が動かなくなった (reported by odili) [#D2322]
7741+
https://github.com/akinomyoga/ble.sh/issues/557
7742+
7743+
upstream で変数名を変えた様だ。修正する必要がある。一々動作確認するのも面倒
7744+
である。shell integration script を見る限りは、新しい変数名に対応しておけば
7745+
大丈夫だろうという気がする。
7746+
77407747
* progcomp: dnf completion の workaround が動かなくなっている (reported by msr8) [#D2321]
77417748
https://github.com/akinomyoga/ble.sh/issues/555
77427749

0 commit comments

Comments
 (0)