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

diff --cc lisp/bindings.el
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/simple.el
index 0b40d53b7563fa644b310bba5d13e25e0a2ef37b,38c9bff41305ca21e1b2258598d67115d8c8d424..50a727aa15fd83b54793506e30b63ec718b08105
--- 1/lisp/simple.el
--- 2/lisp/simple.el
+++ b/lisp/simple.el
@@@ -5029,7 -5034,17 +5038,17 @@@ the front of the list of recently selec
  \f
  ;;; 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

diff --cc lisp/startup.el
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge