diff options
| author | Miles Bader <miles@gnu.org> | 2007-12-28 22:26:14 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-12-28 22:26:14 +0000 |
| commit | b17f53abc28496125965f36147b76ea5f6a2b4fb (patch) | |
| tree | 4293e53692f304327ba689dfeea32d1b0b5bc12a /lisp/comint.el | |
| parent | 2e5093251c8e63f4546ffc30182dd4015e9a58fd (diff) | |
| parent | ea7ac2eb953bf3c30670e60cb00a9fca611b38b7 (diff) | |
| download | emacs-b17f53abc28496125965f36147b76ea5f6a2b4fb.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-966
Diffstat (limited to 'lisp/comint.el')
| -rw-r--r-- | lisp/comint.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/comint.el b/lisp/comint.el index f1d9243cc60..94b1842fb1c 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -336,8 +336,9 @@ This variable is buffer-local." ;; 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. +;; Something called "perforce" uses "Enter password:". (defcustom comint-password-prompt-regexp - "\\(\\([Oo]ld \\|[Nn]ew \\|'s \\|login \\|\ + "\\(\\(Enter \\|[Oo]ld \\|[Nn]ew \\|'s \\|login \\|\ Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\ \[Pp]assword\\( (again)\\)?\\|\ pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\ @@ -452,6 +453,10 @@ executed once when the buffer is created." (define-key map "\e\C-l" 'comint-show-output) (define-key map "\C-m" 'comint-send-input) (define-key map "\C-d" 'comint-delchar-or-maybe-eof) + ;; The following two are standardly aliased to C-d, + ;; but they should never do EOF, just delete. + (define-key map [delete] 'delete-char) + (define-key map [kp-delete] 'delete-char) (define-key map "\C-c " 'comint-accumulate) (define-key map "\C-c\C-x" 'comint-get-next-from-history) (define-key map "\C-c\C-a" 'comint-bol-or-process-mark) |