summaryrefslogtreecommitdiff
path: root/lisp/simple.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2007-09-07 19:49:17 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2007-09-07 19:49:17 +0000
commit08ea6d2fac90ecd9a136647322f5ba155b7cf73d (patch)
tree68bc1a44455d8781b20b832a3ce6c710728e1506 /lisp/simple.el
parent8b5f251b263416b9f7f4eccc373cc54b0f16ef1b (diff)
downloademacs-08ea6d2fac90ecd9a136647322f5ba155b7cf73d.tar.gz
(normal-erase-is-backspace-setup-frame): Massage.
Diffstat (limited to 'lisp/simple.el')
-rw-r--r--lisp/simple.el31
1 files changed, 15 insertions, 16 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index 264bb7aa6e1..02193af41d4 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5659,22 +5659,21 @@ call `normal-erase-is-backspace-mode' (which see) instead."
(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.