[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 124a3cb: Final tweak for Tramp's yubikey detection
From: |
Michael Albinus |
Subject: |
master 124a3cb: Final tweak for Tramp's yubikey detection |
Date: |
Tue, 27 Jul 2021 03:28:40 -0400 (EDT) |
branch: master
commit 124a3cb60b0b5e5f7802b494cafe2266e8cf5b2a
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Final tweak for Tramp's yubikey detection
* lisp/net/tramp.el (tramp-yubikey-regexp)
(tramp-action-show-and-confirm-message): Expect also "\n".
---
lisp/net/tramp.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 5d7dead..2a664b6 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -700,7 +700,7 @@ The regexp should match at end of buffer."
;; Yubikey requires the user physically to touch the device with their
;; finger. We must tell it to the user.
(defcustom tramp-yubikey-regexp
- "^\r*Confirm user presence for key .*\r*"
+ "^\r*Confirm user presence for key .*[\r\n]*"
"Regular expression matching yubikey confirmation message.
The regexp should match at end of buffer."
:version "28.1"
@@ -4690,7 +4690,7 @@ Wait, until the connection buffer changes."
(goto-char (point-min))
(tramp-check-for-regexp proc tramp-process-action-regexp)
(tramp-message
- vec 0 "%s" (replace-regexp-in-string "\r" "" (match-string 1)))
+ vec 0 "%s" (replace-regexp-in-string "[\r\n]" "" (match-string 1)))
;; Hide message.
(narrow-to-region (point-max) (point-max))
;; Wait for new output.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 124a3cb: Final tweak for Tramp's yubikey detection,
Michael Albinus <=