From 7e16d9d114b1fe555fe096ecd42d93a5173973a5 Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Tue, 8 Dec 2020 22:13:52 +0800 Subject: [PATCH] term: fix a bug that VTE based terminals are not recognized --- memo/ChangeLog.md | 2 ++ note.txt | 5 +++++ src/util.sh | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/memo/ChangeLog.md b/memo/ChangeLog.md index 8c9d9228..f9857e26 100644 --- a/memo/ChangeLog.md +++ b/memo/ChangeLog.md @@ -9,6 +9,8 @@ ## Fixes +- term: fix a bug that VTE based terminals are not recognized + ## Internal changes and fixes diff --git a/note.txt b/note.txt index 2b2cc104..c0d80a57 100644 --- a/note.txt +++ b/note.txt @@ -3680,3 +3680,8 @@ bash_tips Done (実装ログ) ------------------------------------------------------------------------------- +2020-12-08 + + * util/term: lxterminal, gnome-terminal で vte の検出に失敗している [#D1427] + これはソースコードを確認してみた所、xterm の version 抽出コードを追加した時 + に動かなくなった物の様に見える。修正した。 diff --git a/src/util.sh b/src/util.sh index 364f4bc4..f08ec0bf 100644 --- a/src/util.sh +++ b/src/util.sh @@ -4139,7 +4139,8 @@ function ble/term/DA2/initialize-term { if rex='^xterm(-|$)'; [[ $TERM =~ $rex ]]; then local version=${da2r[1]} if rex='^1;[0-9]+;0$'; [[ $_ble_term_DA2R =~ $rex ]]; then - ((version==0||95<=version)) + # 2000以上は vte + ((version==0||95<=version&&version<2000)) elif rex='^0;[0-9]+;0$'; [[ $_ble_term_DA2R =~ $rex ]]; then ((95<=version)) elif rex='^(2|24|1[89]|41|6[145]);[0-9]+;0$'; [[ $_ble_term_DA2R =~ $rex ]]; then