diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/comint.el | 2 | ||||
| -rw-r--r-- | test/ChangeLog | 4 | ||||
| -rw-r--r-- | test/comint-testsuite.el | 59 |
4 files changed, 69 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9584d1ed753..d94489a20d9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-06-11 Chong Yidong <cyd@stupidchicken.com> + + * comint.el (comint-password-prompt-regexp): Fix 2010-04-10 change + (Bug#6367). + 2010-06-11 Stephen Eglen <stephen@gnu.org> * shell.el: Bind `shell-resync-dirs' to M-RET. diff --git a/lisp/comint.el b/lisp/comint.el index fd3cff3b5f9..b097baad189 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -340,7 +340,7 @@ This variable is buffer-local." ;; Something called "perforce" uses "Enter password:". (defcustom comint-password-prompt-regexp (concat - "^\\(" + "\\(" (regexp-opt '("Enter" "Enter same" "Old" "old" "New" "new" "'s" "login" "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "[sudo]" "Repeat" "Bad")) diff --git a/test/ChangeLog b/test/ChangeLog index d5199c04b53..d1825c0d169 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2010-06-11 Chong Yidong <cyd@stupidchicken.com> + + * comint-testsuite.el: New file. + 2010-06-02 Stefan Monnier <monnier@iro.umontreal.ca> * indent: New dir. diff --git a/test/comint-testsuite.el b/test/comint-testsuite.el new file mode 100644 index 00000000000..35b946cf3da --- /dev/null +++ b/test/comint-testsuite.el @@ -0,0 +1,59 @@ +;;; bytecomp-testsuite.el + +;; Copyright (C) 2010 Free Software Foundation, Inc. + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. + +;;; Commentary: + +;; Tests for comint and related modes. + +;;; Code: + +(require 'comint) + +(defun comint-testsuite-run () + (interactive) + (with-output-to-temp-buffer "*comint test*" + (comint-testsuite--test-comint-password-prompt-regexp))) + +(defun comint-testsuite--test-comint-password-prompt-regexp () + (interactive) + (let ((password-strings + '("foo@example.net's password: " ;ssh + "Password for foo@example.org: " ; knit + "Kerberos password for devnull/root <at> GNU.ORG: " ; ksu + "Enter passphrase: " ; ssh-add + "Enter passphrase (empty for no passphrase): " ; ssh-keygen + "Enter same passphrase again: " ; ssh-keygen + "Passphrase for key root@GNU.ORG: " ; plink + "[sudo] password for user:" ; Ubuntu sudo + "Password (again):" + "Enter password:")) + fail) + (dolist (str password-strings) + (unless (string-match comint-password-prompt-regexp str) + (setq fail t) + (princ (format " ERROR: comint-password-prompt-regexp did not match %s\n" + str)))) + (if fail + (princ "FAILED: comint-password-prompt-regexp test\n") + (princ "PASSED: comint-password-prompt-regexp test\n")))) + +(provide 'comint-testsuite) + +;;; comint-testsuite.el ends here + |