* lisp/term/ns-win.el (ns-store-cut-buffer-internal)

(ns-copy-including-secondary): Use gui-set-selection.

Fixes: debbugs:18816

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 54d31c963f3803057c541183a5b6fd18c1525895..da6c936810a531e34db47caa5a49c3cc5df36ebc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * term/ns-win.el (ns-store-cut-buffer-internal)
+       (ns-copy-including-secondary): Use gui-set-selection (bug#18816).
+
 2014-10-24  Martin Rudalics  <rudalics@gmx.at>
 
        * mouse.el (mouse-drag-line): Don't use mouse-pixel-position.

diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 99cc46e20a4a5a1c00155b11fcee30c0e3867268..2c8dc85c017f877d39d7d28f7ca6b053662c8e74 100644 (file)
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -718,19 +718,18 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 ;;;; Pasteboard support.
 
 (declare-function ns-get-selection-internal "nsselect.m" (buffer))
-(declare-function ns-store-selection-internal "nsselect.m" (buffer string))
 
 (define-obsolete-function-alias 'ns-get-cut-buffer-internal
   'ns-get-selection-internal "24.1")
 (define-obsolete-function-alias 'ns-store-cut-buffer-internal
-  'ns-store-selection-internal "24.1")
+  'gui-set-selection "24.1")
 
 
 (defun ns-copy-including-secondary ()
   (interactive)
   (call-interactively 'kill-ring-save)
-  (ns-store-selection-internal 'SECONDARY
-                              (buffer-substring (point) (mark t))))
+  (gui-set-selection 'SECONDARY (buffer-substring (point) (mark t))))
+
 (defun ns-paste-secondary ()
   (interactive)
   (insert (ns-get-selection-internal 'SECONDARY)))