From: Karoly Lorentey <lorentey@elte.hu>
Date: Wed, 16 Mar 2005 15:59:10 +0000 (+0000)
Subject: Merged from miles@gnu.org--gnu-2005 (patch 159)
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~293
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a810eaf92838985d9648acb470dc3c8d26847c15;p=emacs.git

Merged from miles@gnu.org--gnu-2005 (patch 159)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-159
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-307
---

a810eaf92838985d9648acb470dc3c8d26847c15
diff --cc lisp/simple.el
index 0b40d53b756,38c9bff4130..50a727aa15f
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@@ -5029,7 -5034,17 +5038,17 @@@ the front of the list of recently selec
  
  ;;; Handling of Backspace and Delete keys.
  
- (defcustom normal-erase-is-backspace nil
+ (defcustom normal-erase-is-backspace
+   (and (not noninteractive)
+        (or (memq system-type '(ms-dos windows-nt))
 -	   (and (memq window-system '(x))
++	   (and (memq initial-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)
++	   (and (null initial-window-system)
+ 		(eq tty-erase-char ?\^H))))
    "If non-nil, Delete key deletes forward and Backspace key deletes backward.
  
  On window systems, the default value of this option is chosen