1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00

Make comint understand the ccrypt password phrases

* lisp/comint.el (comint-password-prompt-regexp): Add the ccrypt
confirmation phrase (bug#50837).

* lisp/international/mule-conf.el (password-word-equivalents): Add
the ccrypt phrases.
This commit is contained in:
Lars Ingebrigtsen 2021-09-27 08:15:24 +02:00
parent bec88ecc82
commit 00011c0ad2
3 changed files with 8 additions and 1 deletions

View File

@ -382,7 +382,10 @@ This variable is buffer-local."
"\\(?:" (regexp-opt password-word-equivalents) "\\|Response\\)"
"\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?"
;; "[[:alpha:]]" used to be "for", which fails to match non-English.
"\\(?: [[:alpha:]]+ .+\\)?[[:blank:]]*[::៖][[:space:]]*\\'")
"\\(?: [[:alpha:]]+ .+\\)?[[:blank:]]*[::៖][[:space:]]*\\'"
;; The ccrypt encryption dialogue doesn't end with a colon, so
;; treat it specially.
"\\|^Enter encryption key: (repeat) *\\'")
"Regexp matching prompts for passwords in the inferior process.
This is used by `comint-watch-for-password-prompt'."
:version "28.1"

View File

@ -1679,6 +1679,7 @@ for decoding and encoding files, process I/O, etc."
(defcustom password-word-equivalents
'("password" "passcode" "passphrase" "pass phrase" "pin"
"decryption key" "encryption key" ; From ccrypt.
; These are sorted according to the GNU en_US locale.
"암호" ; ko
"パスワード" ; ja

View File

@ -44,6 +44,9 @@
"Password (again):"
"Enter password:"
"Current password:" ; "passwd" (to change password) in Debian.
"Enter encryption key: " ; ccrypt
"Enter decryption key: " ; ccrypt
"Enter encryption key: (repeat) " ; ccrypt
"Enter Auth Password:" ; OpenVPN (Bug#35724)
"Verify password: " ; zip -e zipfile.zip ... (Bug#47209)
"Mot de Passe :" ; localized (Bug#29729)