Merge branch 'master' into cairo

[gnu-emacs] / lisp / mouse-copy.el

diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el
index ddfb879318ff74a239a63638976096be0bdc24a1..d3c3c80fd99d1a2758a444419da8594653b78d4f 100644 (file)
--- a/lisp/mouse-copy.el
+++ b/lisp/mouse-copy.el
@@ -1,6 +1,6 @@
 ;;; mouse-copy.el --- one-click text copy and move
 
-;; Copyright (C) 1996, 2001-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001-2015 Free Software Foundation, Inc.
 
 ;; Author: John Heidemann <johnh@ISI.EDU>
 ;; Keywords: mouse
@@ -177,7 +177,7 @@ put the point at one place, then click and drag over some other region."
            (mouse-copy-work-around-drag-bug start-event last-input-event))
        ;; Remember what we do so we can undo it, if necessary.
        (setq mouse-copy-last-paste-start (point))
-       (insert (x-get-selection 'SECONDARY))
+       (insert (gui-get-selection 'SECONDARY))
        (setq mouse-copy-last-paste-end (point)))
     (setq mouse-copy-last-paste-start nil)))
 
@@ -216,7 +216,7 @@ by johnh@ficus.cs.ucla.edu."
   (if (mouse-drag-secondary start-event)
       (progn
        (mouse-kill-preserving-secondary)
-       (insert (x-get-selection 'SECONDARY))))
+       (insert (gui-get-selection 'SECONDARY))))
 )
 
 (provide 'mouse-copy)