* lisp/term/ns-win.el: Add functions to ns frame, not x frame.

Fixes: debbugs:18614

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e5ef6703e68a75a02ea3c6310e2f58b092dccb77..1f9ac164cfa780074a4a5a0691341f1e4f7f3119 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-02  David Raynes  <rayners@gmail.com>  (tiny change)
+
+       * term/ns-win.el: Add functions to ns frame, not x frame (bug#18614).
+
 2014-10-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * obsolete/lucid.el (read-number): Remove, redundant.

diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 5889baf6946c85ff8e13e4f7452c4de505b00f63..b1d3a00df0c6861b7e6039bbc74be97516add6d8 100644 (file)
--- 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.")
                      (when gui-select-enable-clipboard
                        (ns-set-pasteboard text))))
 
-(gui-method-define gui-own-selection x #'ns-own-selection-internal)
-(gui-method-define gui-disown-selection x #'ns-disown-selection-internal)
-(gui-method-define gui-selection-owner-p x #'ns-selection-owner-p)
-(gui-method-define gui-get-selection x #'x-get-selection-internal) ;FIXME:name!
+(gui-method-define gui-own-selection ns #'ns-own-selection-internal)
+(gui-method-define gui-disown-selection ns #'ns-disown-selection-internal)
+(gui-method-define gui-selection-owner-p ns #'ns-selection-owner-p)
+(gui-method-define gui-get-selection ns #'x-get-selection-internal) ;FIXME:name!
 
 (provide 'ns-win)