Mercurial > emacs
comparison lisp/comint.el @ 108450:de8a1b891175
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 11 Apr 2010 10:53:01 +0000 |
parents | ffe32691e3ab |
children | bd3afd9376c5 |
comparison
equal
deleted
inserted
replaced
108449:0346e41d1e53 | 108450:de8a1b891175 |
---|---|
338 ;; plink prints a prompt like `Passphrase for key "root@GNU.ORG": '. | 338 ;; plink prints a prompt like `Passphrase for key "root@GNU.ORG": '. |
339 ;; Ubuntu's sudo prompts like `[sudo] password for user:' | 339 ;; Ubuntu's sudo prompts like `[sudo] password for user:' |
340 ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. | 340 ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. |
341 ;; Something called "perforce" uses "Enter password:". | 341 ;; Something called "perforce" uses "Enter password:". |
342 (defcustom comint-password-prompt-regexp | 342 (defcustom comint-password-prompt-regexp |
343 "\\(\\(Enter \\|[Oo]ld \\|[Nn]ew \\|'s \\|login \\|\ | 343 (concat |
344 Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\ | 344 "^\\(" |
345 \[Pp]assword\\( (again)\\)?\\|\ | 345 (regexp-opt |
346 pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\ | 346 '("Enter" "Enter same" "Old" "old" "New" "new" "'s" "login" |
347 \\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'" | 347 "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "[sudo]" "Repeat" "Bad")) |
348 " +\\)?" | |
349 (regexp-opt | |
350 '("password" "Password" "passphrase" "Passphrase" | |
351 "pass phrase" "Pass phrase")) | |
352 "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?\ | |
353 \\(?: for [^:]+\\)?:\\s *\\'") | |
348 "Regexp matching prompts for passwords in the inferior process. | 354 "Regexp matching prompts for passwords in the inferior process. |
349 This is used by `comint-watch-for-password-prompt'." | 355 This is used by `comint-watch-for-password-prompt'." |
350 :type 'regexp | 356 :type 'regexp |
351 :group 'comint) | 357 :group 'comint) |
352 | 358 |