(normal-erase-is-backspace-setup-frame): Massage.

2 files changed, 19 insertions, 16 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b757a8db92..3e45f5f9513 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>
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.