From: Glenn Morris <rgm@gnu.org>
Date: Thu, 25 Oct 2007 03:53:10 +0000 (+0000)
Subject: Chris Moore  <christopher.ian.moore at gmail.com>
X-Git-Tag: emacs-pretest-23.0.90~10089
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8e27e33f6597feca9a02073ce480e9abc182e66;p=emacs.git

Chris Moore  <christopher.ian.moore at gmail.com>

(comint-password-prompt-regexp): Handle `[sudo] password'-style prompt.
---

diff --git a/lisp/comint.el b/lisp/comint.el
index 623eef17327..f1d9243cc60 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -334,10 +334,11 @@ This variable is buffer-local."
 ;; ksu prints a prompt like `Kerberos password for devnull/root@GNU.ORG: '.
 ;; ssh-add prints a prompt like `Enter passphrase: '.
 ;; plink prints a prompt like `Passphrase for key "root@GNU.ORG": '.
+;; Ubuntu's sudo prompts like `[sudo] password for user:'
 ;; Some implementations of passwd use "Password (again)" as the 2nd prompt.
 (defcustom comint-password-prompt-regexp
   "\\(\\([Oo]ld \\|[Nn]ew \\|'s \\|login \\|\
-Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|^\\)\
+Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\
 \[Pp]assword\\( (again)\\)?\\|\
 pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\
 \\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'"