aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Raynes2014-10-02 20:15:34 -0400
committerStefan Monnier2014-10-02 20:15:34 -0400
commitf0da11bd3978faee12cd15b26dbf2fbf837d8a2b (patch)
tree4e572cf184aebec4cdb16fbe87c32b383d1f597b
parentf3c69fb76f3933ba4165855ec5c3ae0635dc4734 (diff)
downloademacs-f0da11bd3978faee12cd15b26dbf2fbf837d8a2b.tar.gz
emacs-f0da11bd3978faee12cd15b26dbf2fbf837d8a2b.zip
* lisp/term/ns-win.el: Add functions to ns frame, not x frame.
Fixes: debbugs:18614
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/term/ns-win.el8
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e5ef6703e68..1f9ac164cfa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-10-02 David Raynes <rayners@gmail.com> (tiny change)
2
3 * term/ns-win.el: Add functions to ns frame, not x frame (bug#18614).
4
12014-10-02 Stefan Monnier <monnier@iro.umontreal.ca> 52014-10-02 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * obsolete/lucid.el (read-number): Remove, redundant. 7 * obsolete/lucid.el (read-number): Remove, redundant.
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 5889baf6946..b1d3a00df0c 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -971,10 +971,10 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
971 (when gui-select-enable-clipboard 971 (when gui-select-enable-clipboard
972 (ns-set-pasteboard text)))) 972 (ns-set-pasteboard text))))
973 973
974(gui-method-define gui-own-selection x #'ns-own-selection-internal) 974(gui-method-define gui-own-selection ns #'ns-own-selection-internal)
975(gui-method-define gui-disown-selection x #'ns-disown-selection-internal) 975(gui-method-define gui-disown-selection ns #'ns-disown-selection-internal)
976(gui-method-define gui-selection-owner-p x #'ns-selection-owner-p) 976(gui-method-define gui-selection-owner-p ns #'ns-selection-owner-p)
977(gui-method-define gui-get-selection x #'x-get-selection-internal) ;FIXME:name! 977(gui-method-define gui-get-selection ns #'x-get-selection-internal) ;FIXME:name!
978 978
979(provide 'ns-win) 979(provide 'ns-win)
980 980