[Emacs-diffs] Changes to emacs/lisp/simple.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/09/07 19:49:18

Index: simple.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/simple.el,v
retrieving revision 1.874
retrieving revision 1.875
diff -u -b -r1.874 -r1.875
--- simple.el   29 Aug 2007 05:28:03 -0000      1.874
+++ simple.el   7 Sep 2007 19:49:17 -0000       1.875
@@ -5659,7 +5659,8 @@
   (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)
+      (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)
@@ -5668,13 +5669,11 @@
                               (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.
+                        ;; backward, 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)))))
+                             (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.