procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for comint-password-prompt-regexp (Bug#6367).

Browse source 
* lisp/comint.el (comint-password-prompt-regexp): Fix 2010-04-10 change
(Bug#6367).

* comint-testsuite.el: New file.
This commit is contained in:
Chong Yidong 2010-06-11 10:39:54 -04:00
parent 84d9562f57
commit 6534e58a57
4 changed files with 69 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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.

2
lisp/comint.el
View file

@ -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"))

4
test/ChangeLog
View file

@ -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.

59
test/comint-testsuite.el Normal file
View file

@ -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