From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 28 Jul 2021 07:06:37 +0000 (+0200)
Subject: Display yubikey message properly in Tramp
X-Git-Tag: emacs-28.0.90~1672
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2910e668eb95b35a2854426c1e6ef0137da578a4;p=emacs.git

Display yubikey message properly in Tramp

* lisp/net/tramp.el (tramp-action-show-and-confirm-message):
Display message properly.
---

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 51d5d068712..80cdd56c0d8 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4684,17 +4684,15 @@ The terminal type can be configured with `tramp-terminal-type'."
   "Show the user a message for confirmation.
 Wait, until the connection buffer changes."
   (with-current-buffer (process-buffer proc)
-    (let ((enable-recursive-minibuffers t)
-          (stimers (with-timeout-suspend)))
+    (let ((stimers (with-timeout-suspend)))
       (tramp-message vec 6 "\n%s" (buffer-string))
       (goto-char (point-min))
       (tramp-check-for-regexp proc tramp-process-action-regexp)
-      (tramp-message
-       vec 0 "%s" (replace-regexp-in-string "[\r\n]" "" (match-string 0)))
-      ;; Hide message.
-      (narrow-to-region (point-max) (point-max))
-      ;; Wait for new output.
-      (tramp-wait-for-regexp proc 30 ".")
+      (with-temp-message (replace-regexp-in-string "[\r\n]" "" (match-string 0))
+	;; Hide message in buffer.
+	(narrow-to-region (point-max) (point-max))
+	;; Wait for new output.
+	(tramp-wait-for-regexp proc 30 "."))
       ;; Reenable the timers.
       (with-timeout-unsuspend stimers)))
   t)