Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-21 04:17:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Code cleanup for Tramp's yubikey integration

Browse source 
* lisp/net/tramp-sh.el (tramp-actions-before-shell)
(tramp-actions-copy-out-of-band):
Use `tramp-security-key-confirm-regexp'.

* lisp/net/tramp.el (tramp-security-key-confirm-regexp): Rename from
`tramp-yubikey-regexp'.  Adapt docstring.
(tramp-security-key-confirmed-regexp): New defcustom.
(tramp-action-show-and-confirm-message):
Redisplay.  Use `tramp-security-key-confirmed-regexp'.
This commit is contained in:
Michael Albinus 2021-08-03 22:08:18 +02:00
parent 88577aed3a
commit 80cccd7ff1
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/net/tramp-sh.el
View file

@ -519,7 +519,7 @@ shell from reading its init file."
(tramp-yn-prompt-regexp tramp-action-yn)
(tramp-terminal-prompt-regexp tramp-action-terminal)
(tramp-antispoof-regexp tramp-action-confirm-message)
(tramp-yubikey-regexp tramp-action-show-and-confirm-message)
(tramp-security-key-confirm-regexp tramp-action-show-and-confirm-message)
(tramp-process-alive-regexp tramp-action-process-alive))
"List of pattern/action pairs.
Whenever a pattern matches, the corresponding action is performed.
@ -537,7 +537,7 @@ corresponding PATTERN matches, the ACTION function is called.")
'((tramp-password-prompt-regexp tramp-action-password)
(tramp-wrong-passwd-regexp tramp-action-permission-denied)
(tramp-copy-failed-regexp tramp-action-permission-denied)
(tramp-yubikey-regexp tramp-action-show-and-confirm-message)
(tramp-security-key-confirm-regexp tramp-action-show-and-confirm-message)
(tramp-process-alive-regexp tramp-action-out-of-band))
"List of pattern/action pairs.
This list is used for copying/renaming with out-of-band methods.

3
lisp/net/tramp.el
View file

@ -4691,10 +4691,11 @@ Wait, until the connection buffer changes."
(goto-char (point-min))
(tramp-check-for-regexp proc tramp-process-action-regexp)
(with-temp-message (replace-regexp-in-string "[\r\n]" "" (match-string 0))
(redisplay 'force)
;; Hide message in buffer.
(narrow-to-region (point-max) (point-max))
;; Wait for new output.
(tramp-wait-for-regexp proc 30 "."))
(tramp-wait-for-regexp proc 30 tramp-security-key-confirmed-regexp))
;; Reenable the timers.
(with-timeout-unsuspend stimers)))
t)