Mercurial > emacs
comparison lisp/comint.el @ 91302:56a72e2bd635
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-306
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 29 Dec 2007 02:39:17 +0000 |
parents | 4bc33ffdda1a cdd30283527d |
children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
91301:7774e5860c70 | 91302:56a72e2bd635 |
---|---|
334 ;; ksu prints a prompt like `Kerberos password for devnull/root@GNU.ORG: '. | 334 ;; ksu prints a prompt like `Kerberos password for devnull/root@GNU.ORG: '. |
335 ;; ssh-add prints a prompt like `Enter passphrase: '. | 335 ;; ssh-add prints a prompt like `Enter passphrase: '. |
336 ;; plink prints a prompt like `Passphrase for key "root@GNU.ORG": '. | 336 ;; plink prints a prompt like `Passphrase for key "root@GNU.ORG": '. |
337 ;; Ubuntu's sudo prompts like `[sudo] password for user:' | 337 ;; Ubuntu's sudo prompts like `[sudo] password for user:' |
338 ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. | 338 ;; Some implementations of passwd use "Password (again)" as the 2nd prompt. |
339 ;; Something called "perforce" uses "Enter password:". | |
339 (defcustom comint-password-prompt-regexp | 340 (defcustom comint-password-prompt-regexp |
340 "\\(\\([Oo]ld \\|[Nn]ew \\|'s \\|login \\|\ | 341 "\\(\\(Enter \\|[Oo]ld \\|[Nn]ew \\|'s \\|login \\|\ |
341 Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\ | 342 Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\ |
342 \[Pp]assword\\( (again)\\)?\\|\ | 343 \[Pp]assword\\( (again)\\)?\\|\ |
343 pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\ | 344 pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\ |
344 \\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'" | 345 \\(?:, try again\\)?\\(?: for [^:]+\\)?:\\s *\\'" |
345 "*Regexp matching prompts for passwords in the inferior process. | 346 "*Regexp matching prompts for passwords in the inferior process. |
450 (define-key map [?\C-c ?\M-r] 'comint-previous-matching-input-from-input) | 451 (define-key map [?\C-c ?\M-r] 'comint-previous-matching-input-from-input) |
451 (define-key map [?\C-c ?\M-s] 'comint-next-matching-input-from-input) | 452 (define-key map [?\C-c ?\M-s] 'comint-next-matching-input-from-input) |
452 (define-key map "\e\C-l" 'comint-show-output) | 453 (define-key map "\e\C-l" 'comint-show-output) |
453 (define-key map "\C-m" 'comint-send-input) | 454 (define-key map "\C-m" 'comint-send-input) |
454 (define-key map "\C-d" 'comint-delchar-or-maybe-eof) | 455 (define-key map "\C-d" 'comint-delchar-or-maybe-eof) |
456 ;; The following two are standardly aliased to C-d, | |
457 ;; but they should never do EOF, just delete. | |
458 (define-key map [delete] 'delete-char) | |
459 (define-key map [kp-delete] 'delete-char) | |
455 (define-key map "\C-c " 'comint-accumulate) | 460 (define-key map "\C-c " 'comint-accumulate) |
456 (define-key map "\C-c\C-x" 'comint-get-next-from-history) | 461 (define-key map "\C-c\C-x" 'comint-get-next-from-history) |
457 (define-key map "\C-c\C-a" 'comint-bol-or-process-mark) | 462 (define-key map "\C-c\C-a" 'comint-bol-or-process-mark) |
458 (define-key map "\C-c\C-u" 'comint-kill-input) | 463 (define-key map "\C-c\C-u" 'comint-kill-input) |
459 (define-key map "\C-c\C-w" 'backward-kill-word) | 464 (define-key map "\C-c\C-w" 'backward-kill-word) |