aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2015-04-28 23:32:09 -0700
committerGlenn Morris2015-04-28 23:40:27 -0700
commit4594f894e60a50e3b5449d762b44a6c69b1bcae6 (patch)
treec976f7af1a0a053d600066527b9f932af12b2ce5
parentb7352cb2fa65655dbf97cb7d80ebb1f77dffc039 (diff)
downloademacs-4594f894e60a50e3b5449d762b44a6c69b1bcae6.tar.gz
emacs-4594f894e60a50e3b5449d762b44a6c69b1bcae6.zip
Replace an obsolete function alias
* lisp/isearch.el (isearch-yank-x-selection): * lisp/mouse-copy.el (mouse-drag-secondary-pasting) (mouse-drag-secondary-moving): * lisp/obsolete/mouse-sel.el (mouse-sel-get-selection-function): Replace obsolete alias x-get-selection with gui-get-selection.
-rw-r--r--lisp/isearch.el4
-rw-r--r--lisp/mouse-copy.el4
-rw-r--r--lisp/obsolete/mouse-sel.el2
3 files changed, 5 insertions, 5 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 35fb0608dd0..c714ba0055d 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1924,8 +1924,8 @@ If search string is empty, just beep."
1924(defun isearch-yank-x-selection () 1924(defun isearch-yank-x-selection ()
1925 "Pull current X selection into search string." 1925 "Pull current X selection into search string."
1926 (interactive) 1926 (interactive)
1927 (isearch-yank-string (x-get-selection)) 1927 (isearch-yank-string (gui-get-selection))
1928 ;; If `x-get-selection' returned the text from the active region, 1928 ;; If `gui-get-selection' returned the text from the active region,
1929 ;; then it "used" the mark which we should hence deactivate. 1929 ;; then it "used" the mark which we should hence deactivate.
1930 (when select-active-regions (deactivate-mark))) 1930 (when select-active-regions (deactivate-mark)))
1931 1931
diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el
index 609713ce5fd..d3c3c80fd99 100644
--- a/lisp/mouse-copy.el
+++ b/lisp/mouse-copy.el
@@ -177,7 +177,7 @@ put the point at one place, then click and drag over some other region."
177 (mouse-copy-work-around-drag-bug start-event last-input-event)) 177 (mouse-copy-work-around-drag-bug start-event last-input-event))
178 ;; Remember what we do so we can undo it, if necessary. 178 ;; Remember what we do so we can undo it, if necessary.
179 (setq mouse-copy-last-paste-start (point)) 179 (setq mouse-copy-last-paste-start (point))
180 (insert (x-get-selection 'SECONDARY)) 180 (insert (gui-get-selection 'SECONDARY))
181 (setq mouse-copy-last-paste-end (point))) 181 (setq mouse-copy-last-paste-end (point)))
182 (setq mouse-copy-last-paste-start nil))) 182 (setq mouse-copy-last-paste-start nil)))
183 183
@@ -216,7 +216,7 @@ by johnh@ficus.cs.ucla.edu."
216 (if (mouse-drag-secondary start-event) 216 (if (mouse-drag-secondary start-event)
217 (progn 217 (progn
218 (mouse-kill-preserving-secondary) 218 (mouse-kill-preserving-secondary)
219 (insert (x-get-selection 'SECONDARY)))) 219 (insert (gui-get-selection 'SECONDARY))))
220) 220)
221 221
222(provide 'mouse-copy) 222(provide 'mouse-copy)
diff --git a/lisp/obsolete/mouse-sel.el b/lisp/obsolete/mouse-sel.el
index fcadedf6262..865a4277dda 100644
--- a/lisp/obsolete/mouse-sel.el
+++ b/lisp/obsolete/mouse-sel.el
@@ -315,7 +315,7 @@ is `interprogram-cut-paste'.")
315 (or (gui-selection-value) 315 (or (gui-selection-value)
316 (bound-and-true-p x-last-selected-text-primary) 316 (bound-and-true-p x-last-selected-text-primary)
317 gui--last-selected-text-primary) 317 gui--last-selected-text-primary)
318 (x-get-selection selection))) 318 (gui-get-selection selection)))
319 "Function to call to get the selection. 319 "Function to call to get the selection.
320Called with one argument: 320Called with one argument:
321 321