diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-02 21:39:49 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-02 21:39:49 -0400 |
| commit | d6f8fef3fc17187687fafce50b428f88a278aee9 (patch) | |
| tree | 042705e9c52b2799144888fe9a602022f8d84e72 /lisp/term/common-win.el | |
| parent | f0da11bd3978faee12cd15b26dbf2fbf837d8a2b (diff) | |
| download | emacs-d6f8fef3fc17187687fafce50b428f88a278aee9.tar.gz | |
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.
Diffstat (limited to 'lisp/term/common-win.el')
| -rw-r--r-- | lisp/term/common-win.el | 3 |
1 files changed, 1 insertions, 2 deletions
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) |