Mercurial > emacs
changeset 84381:38640f40d45e
(normal-erase-is-backspace-setup-frame): Massage.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 07 Sep 2007 19:49:17 +0000 |
| parents | 2fa07ee359f5 |
| children | 6c8a27754af8 |
| files | lisp/ChangeLog lisp/simple.el |
| diffstat | 2 files changed, 19 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Sep 07 19:47:56 2007 +0000 +++ b/lisp/ChangeLog Fri Sep 07 19:49:17 2007 +0000 @@ -1,5 +1,9 @@ 2007-09-07 Stefan Monnier <monnier@iro.umontreal.ca> + * simple.el (normal-erase-is-backspace-setup-frame): Massage. + + * term/xterm.el (xterm-function-map): Initialize in the declaration. + * vc-arch.el (vc-arch-checkin): Fix typo. 2007-09-07 Johan Bockg,Ae(Brd <bojohan@gnu.org>
--- a/lisp/simple.el Fri Sep 07 19:47:56 2007 +0000 +++ b/lisp/simple.el Fri Sep 07 19:49:17 2007 +0000 @@ -5659,22 +5659,21 @@ (unless frame (setq frame (selected-frame))) (with-selected-frame frame (unless (terminal-parameter nil 'normal-erase-is-backspace) - (if (cond ((eq normal-erase-is-backspace 'maybe) - (and (not noninteractive) - (or (memq system-type '(ms-dos windows-nt)) - (eq window-system 'mac) - (and (memq window-system '(x)) - (fboundp 'x-backspace-delete-keys-p) - (x-backspace-delete-keys-p)) - ;; If the terminal Emacs is running on has erase char - ;; set to ^H, use the Backspace key for deleting - ;; backward and, and the Delete key for deleting forward. - (and (null window-system) - (eq tty-erase-char ?\^H))))) - (t - normal-erase-is-backspace)) - (normal-erase-is-backspace-mode 1) - (normal-erase-is-backspace-mode 0))))) + (normal-erase-is-backspace-mode + (if (if (eq normal-erase-is-backspace 'maybe) + (and (not noninteractive) + (or (memq system-type '(ms-dos windows-nt)) + (eq window-system 'mac) + (and (memq window-system '(x)) + (fboundp 'x-backspace-delete-keys-p) + (x-backspace-delete-keys-p)) + ;; If the terminal Emacs is running on has erase char + ;; set to ^H, use the Backspace key for deleting + ;; backward, and the Delete key for deleting forward. + (and (null window-system) + (eq tty-erase-char ?\^H)))) + normal-erase-is-backspace) + 1 0))))) (defun normal-erase-is-backspace-mode (&optional arg) "Toggle the Erase and Delete mode of the Backspace and Delete keys.