[Emacs-diffs] /srv/bzr/emacs/trunk r100581: Fix for comint-password-prompt-regexp (Bug#6367).

[Chong Yidong]

------------------------------------------------------------
revno: 100581
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2010-06-11 10:39:54 -0400
message:
  Fix for comint-password-prompt-regexp (Bug#6367).
  
  * lisp/comint.el (comint-password-prompt-regexp): Fix 2010-04-10 change
  (Bug#6367).
  
  * comint-testsuite.el: New file.
added:
  test/comint-testsuite.el
modified:
  lisp/ChangeLog
  lisp/comint.el
  test/ChangeLog

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-11 13:28:41 +0000
+++ b/lisp/ChangeLog    2010-06-11 14:39:54 +0000
@@ -1,3 +1,8 @@
+2010-06-11  Chong Yidong  <address@hidden>
+
+       * comint.el (comint-password-prompt-regexp): Fix 2010-04-10 change
+       (Bug#6367).
+
 2010-06-11  Stephen Eglen  <address@hidden>
 
        * shell.el: Bind `shell-resync-dirs' to M-RET.

=== modified file 'lisp/comint.el'
--- a/lisp/comint.el    2010-05-20 21:38:59 +0000
+++ b/lisp/comint.el    2010-06-11 14:39:54 +0000
@@ -340,7 +340,7 @@
 ;; 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"))

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2010-06-02 20:13:11 +0000
+++ b/test/ChangeLog    2010-06-11 14:39:54 +0000
@@ -1,3 +1,7 @@
+2010-06-11  Chong Yidong  <address@hidden>
+
+       * comint-testsuite.el: New file.
+
 2010-06-02  Stefan Monnier  <address@hidden>
 
        * indent: New dir.

=== added file 'test/comint-testsuite.el'
--- a/test/comint-testsuite.el  1970-01-01 00:00:00 +0000
+++ b/test/comint-testsuite.el  2010-06-11 14:39:54 +0000
@@ -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
+        '("address@hidden's password: " ;ssh
+          "Password for address@hidden: " ; 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 address@hidden: " ; 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
+