From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 24 Oct 2014 22:23:43 +0000 (-0400)
Subject: * lisp/term/ns-win.el (ns-store-cut-buffer-internal)
X-Git-Tag: emacs-25.0.90~2635^2~659
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ac6839a839e08749669e2f25873ac911afbfe42c;p=emacs.git

* 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 54d31c963f3..da6c936810a 100644
--- 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 99cc46e20a4..2c8dc85c017 100644
--- 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)))