From c2a268a3348094a3ff4b83c65b8aed04aacbca28 Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Mon, 15 Jul 2019 17:23:42 +0900 Subject: [PATCH] main: hotfix d35682a --- ble.pp | 4 +++- src/edit.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ble.pp b/ble.pp index 69136d4b..4cebdc0f 100644 --- a/ble.pp +++ b/ble.pp @@ -719,7 +719,9 @@ function ble/base/process-blesh-arguments { (attach) ble-attach ;; (prompt) _ble_base_attach_PROMPT_COMMAND=$PROMPT_COMMAND _ble_base_attach_from_prompt=1 - PROMPT_COMMAND=ble/base/attach-from-PROMPT_COMMAND ;; + PROMPT_COMMAND=ble/base/attach-from-PROMPT_COMMAND + [[ $_ble_edit_detach_flag == reload ]] && + _ble_edit_detach_flag= ;; esac [[ ! $opt_error ]] } diff --git a/src/edit.sh b/src/edit.sh index ae7b6a85..98487aba 100644 --- a/src/edit.sh +++ b/src/edit.sh @@ -7082,7 +7082,7 @@ function ble-edit/bind/.exit-TRAPRTMAX { ## function ble-edit/bind/.check-detach { # Note: #D1130 reload の為に detach して attach しなかった場合 - if [[ $_ble_edit_detach_flag == reload ]]; then + if [[ ! $_ble_attached && $_ble_edit_detach_flag == reload ]]; then ble-detach/message \ "${_ble_term_setaf[12]}[ble: detached]$_ble_term_sgr0" \ "Please run \`stty sane' to recover the correct TTY state."