edit: update mc-4.8.29 integration

akinomyoga · Aug 15, 2023 · 2c4194a · 2c4194a
1 parent a2e2c4b
commit 2c4194a
Show file tree

Hide file tree

Showing 5 changed files with 333 additions and 3 deletions.
diff --git a/docs/ChangeLog.md b/docs/ChangeLog.md
@@ -41,6 +41,7 @@
 - util: work around mawk 1.3.3-20090705 regex (reported by dongxi8, Frezrik) `#D2055` 4089c4e1
 - complete: update a workaround for cobra-1.5.0 (reported by 3ximus) `#D2057` a24435d3
 - make: work around ecryptfs bug (reported by juanejot) `#D2058` 969a763e dc0cdb30
+- edit: update mc-4.8.29 integration (reported by mooreye) `#D2062` xxxxxxxx
 
 ## Contrib
 

diff --git a/lib/keymap.vi.sh b/lib/keymap.vi.sh
@@ -506,6 +506,14 @@ function ble/keymap:vi/update-mode-indicator {
     str=$str${str:+' '}$'\e[1;31mREC\e[m'
   fi
 
+  # Note #D2062: mc-4.8.29 以降ではコマンド終了直後に "-- INSERT --" 等の mode
+  # indicator を出力すると、それをプロンプトと勘違いして抽出してしまう。仕方が
+  # ないので mc の中では imap に対しては mode indicator は表示しない様にする。
+  if [[ $_ble_edit_integration_mc_precmd_stop && $keymap == vi_imap ]]; then
+    ble/edit/info/clear
+    return
+  fi
+
   ble/edit/info/default ansi "$str" # 6ms
 }
 blehook internal_PRECMD!=ble/keymap:vi/update-mode-indicator