From d6f8fef3fc17187687fafce50b428f88a278aee9 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 2 Oct 2014 21:39:49 -0400 Subject: New gui-selection-value consolidating x-selection-value. * lisp/select.el (gui-selection-value-alist): New method. (gui-selection-value): New function. (x-selection-value): Make it an obsolete alias. * lisp/simple.el (interprogram-paste-function): Default to gui-selection-value. * lisp/w32-common-fns.el (w32-get-selection-value): Simplify. (x-selection-value): Remove alias. (interprogram-paste-function): Don't set. (gui-selection-value): Define for w32. * lisp/term/x-win.el (gui-selection-value): Define for x. (x--selection-value): Rename from x--selection-value. (interprogram-paste-function): Don't set. * lisp/term/pc-win.el (w16-get-selection-value): Simplify. (msdos-initialize-window-system): Don't set interprogram-paste-function. (gui-selection-value): Define for pc. * lisp/term/ns-win.el (x-selection-value): Remove. (gui-selection-value): Define for ns, instead. * lisp/term/common-win.el (x-setup-function-keys): Don't set interprogram-paste-function. * lisp/obsolete/mouse-sel.el (mouse-sel-get-selection-function): Use gui-selection-value. --- lisp/term/common-win.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lisp/term/common-win.el') diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el index fcb9fd55bb1..d026ee8eabe 100644 --- a/lisp/term/common-win.el +++ b/lisp/term/common-win.el @@ -56,8 +56,7 @@ (set-keymap-parent map (keymap-parent local-function-key-map)) (set-keymap-parent local-function-key-map map)) (when (featurep 'ns) - (setq interprogram-paste-function 'x-selection-value - system-key-alist + (setq system-key-alist (list ;; These are special "keys" used to pass events from C to lisp. (cons (logior (lsh 0 16) 1) 'ns-power-off) -- cgit v1.2.3