(command-line): Don't call x-backspace-delete-keys-p

if not fboundp.  Switch delete-forward mode for the <delete> key
on all PC platforms, even under -nw.

diff --git a/lisp/startup.el b/lisp/startup.el
index 06ed24620b287cbba7a1031353cda4a70824636d..2efe5d7f71250882c0563de0e66aee66febe1064 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -768,9 +768,13 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
     (blink-cursor-mode 1))
 
   (when (and (not noninteractive)
-            (not (eq system-type 'ms-dos))
-            (memq window-system '(x)))
-    (setq-default delete-key-deletes-forward (x-backspace-delete-keys-p))
+            ;; DOS/Windows systems have a PC-type keyboard which has both
+            ;; <delete> and <backspace> keys.
+            (or (memq system-type '(ms-dos windows-nt))
+                (memq window-system '(x))))
+    (setq-default delete-key-deletes-forward
+                 (or (not (fboundp 'x-backspace-delete-keys-p))
+                     (x-backspace-delete-keys-p)))
     (delete-key-deletes-forward-mode 1))
 
   (when (and (not noninteractive)