Mercurial > emacs
changeset 34569:51d2fcdc53a9
(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.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Thu, 14 Dec 2000 16:51:13 +0000 |
| parents | d875269a9d44 |
| children | f6aeb731a068 |
| files | lisp/startup.el |
| diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Thu Dec 14 16:47:18 2000 +0000 +++ b/lisp/startup.el Thu Dec 14 16:51:13 2000 +0000 @@ -768,9 +768,13 @@ (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)