aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2021-03-18 11:17:34 +0100
committerStefan Kangas2021-03-18 11:26:37 +0100
commit4d5ad8a16e1fe925dd3fa0993aabb2612a82622b (patch)
treeddb1f347701417c3b094f9afe6b534994ca4018a
parent4eb030319725cfe7fe17049e91fdbed2e222a3c9 (diff)
downloademacs-4d5ad8a16e1fe925dd3fa0993aabb2612a82622b.tar.gz
emacs-4d5ad8a16e1fe925dd3fa0993aabb2612a82622b.zip
Add comint-password-prompt-regexp test for "zip -e ..."
* test/lisp/comint-tests.el (comint-testsuite-password-strings): Add test for "zip -e ...". (Bug#47209)
-rw-r--r--lisp/comint.el4
-rw-r--r--test/lisp/comint-tests.el1
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/comint.el b/lisp/comint.el
index bb28db7614a..65072b01376 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -366,6 +366,8 @@ This variable is buffer-local."
366;; OpenBSD doas prints "doas (user@host) password:". 366;; OpenBSD doas prints "doas (user@host) password:".
367;; See ert test `comint-test-password-regexp'. 367;; See ert test `comint-test-password-regexp'.
368(defcustom comint-password-prompt-regexp 368(defcustom comint-password-prompt-regexp
369 ;; When extending this, please also add a corresponding test where
370 ;; possible (see `comint-testsuite-password-strings').
369 (concat 371 (concat
370 "\\(^ *\\|" 372 "\\(^ *\\|"
371 (regexp-opt 373 (regexp-opt
@@ -382,7 +384,7 @@ This variable is buffer-local."
382 "\\(?: [[:alpha:]]+ .+\\)?[[:blank:]]*[::៖][[:space:]]*\\'") 384 "\\(?: [[:alpha:]]+ .+\\)?[[:blank:]]*[::៖][[:space:]]*\\'")
383 "Regexp matching prompts for passwords in the inferior process. 385 "Regexp matching prompts for passwords in the inferior process.
384This is used by `comint-watch-for-password-prompt'." 386This is used by `comint-watch-for-password-prompt'."
385 :version "27.1" 387 :version "28.1"
386 :type 'regexp 388 :type 'regexp
387 :group 'comint) 389 :group 'comint)
388 390
diff --git a/test/lisp/comint-tests.el b/test/lisp/comint-tests.el
index de1bc548e18..8a9a41f452f 100644
--- a/test/lisp/comint-tests.el
+++ b/test/lisp/comint-tests.el
@@ -44,6 +44,7 @@
44 "Password (again):" 44 "Password (again):"
45 "Enter password:" 45 "Enter password:"
46 "Enter Auth Password:" ; OpenVPN (Bug#35724) 46 "Enter Auth Password:" ; OpenVPN (Bug#35724)
47 "Verify password: " ; zip -e zipfile.zip ... (Bug#47209)
47 "Mot de Passe :" ; localized (Bug#29729) 48 "Mot de Passe :" ; localized (Bug#29729)
48 "Passwort:") ; localized 49 "Passwort:") ; localized
49 "List of strings that should match `comint-password-prompt-regexp'.") 50 "List of strings that should match `comint-password-prompt-regexp'.")