From a5e5d7773b39cd39924404d40093ba44fc0de7f8 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 29 Dec 2014 12:45:25 -0800 Subject: [PATCH] * obsolete/pc-select.el (pc-selection-mode): Use system-type. This is instead of system-name, which is both wrong here and obsolete. --- lisp/ChangeLog | 5 +++++ lisp/obsolete/pc-select.el | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7bfc38c9b70..5ad67ab4cd7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-29 Paul Eggert + + * obsolete/pc-select.el (pc-selection-mode): Use system-type. + This is instead of system-name, which is both wrong here and obsolete. + 2014-12-29 Dmitry Gutov * menu-bar.el (menu-bar-next-tag-other-window) diff --git a/lisp/obsolete/pc-select.el b/lisp/obsolete/pc-select.el index 5ee0818a1e5..5404f490b88 100644 --- a/lisp/obsolete/pc-select.el +++ b/lisp/obsolete/pc-select.el @@ -337,7 +337,7 @@ but before calling PC Selection mode): (cadr pc-select-meta-moves-sexps-key-bindings)) (if (or pc-select-selection-keys-only (eq window-system 'x) - (memq system-name '(ms-dos windows-nt))) + (memq system-type '(ms-dos windows-nt))) nil pc-select-tty-key-bindings))) @@ -346,7 +346,7 @@ but before calling PC Selection mode): (unless (or pc-select-selection-keys-only (eq window-system 'x) - (memq system-name '(ms-dos windows-nt))) + (memq system-type '(ms-dos windows-nt))) ;; it is not clear that we need the following line ;; I hope it doesn't do too much harm to leave it in, though... (setq pc-select-old-M-delete-binding @@ -355,7 +355,7 @@ but before calling PC Selection mode): (when (and (not pc-select-selection-keys-only) (or (eq window-system 'x) - (memq system-name '(ms-dos windows-nt))) + (memq system-type '(ms-dos windows-nt))) (fboundp 'normal-erase-is-backspace-mode)) (pc-select-save-and-set-mode normal-erase-is-backspace-mode 1 normal-erase-is-backspace)) @@ -378,13 +378,13 @@ but before calling PC Selection mode): (current-global-map)) (unless (or pc-select-selection-keys-only (eq window-system 'x) - (memq system-name '(ms-dos windows-nt))) + (memq system-type '(ms-dos windows-nt))) ;; it is not clear that we need the following line ;; I hope it doesn't do too much harm to leave it in, though... (define-key function-key-map [M-delete] [?\M-d])) (when (and (not pc-select-selection-keys-only) (or (eq window-system 'x) - (memq system-name '(ms-dos windows-nt))) + (memq system-type '(ms-dos windows-nt))) (fboundp 'normal-erase-is-backspace-mode)) (normal-erase-is-backspace-mode 1)) (setq highlight-nonselected-windows nil) @@ -395,7 +395,7 @@ but before calling PC Selection mode): (when pc-select-key-bindings-alist (when (and (not pc-select-selection-keys-only) (or (eq window-system 'x) - (memq system-name '(ms-dos windows-nt)))) + (memq system-type '(ms-dos windows-nt)))) (pc-select-restore-mode normal-erase-is-backspace-mode)) (pc-select-restore-keys