aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2014-07-02 10:42:00 -0400
committerStefan Monnier2014-07-02 10:42:00 -0400
commit4991d13037d4154b3c52d1a2f516714fbcf0e6eb (patch)
tree94b89309a591c94ff9794fed1cfd48a32e9a0050
parentcc4f9c83bccac43a1463769286f0f6b10864ef15 (diff)
downloademacs-4991d13037d4154b3c52d1a2f516714fbcf0e6eb.tar.gz
emacs-4991d13037d4154b3c52d1a2f516714fbcf0e6eb.zip
* mouse.el (mouse-yank-primary, mouse-yank-secondary): Use insert-for-yank.
Fixes: debbugs:17271
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/mouse.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df299ec1341..d9224d0b747 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-07-02 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * mouse.el (mouse-yank-primary, mouse-yank-secondary):
4 Use insert-for-yank (bug#17271).
5
12014-07-02 Leo Liu <sdl.web@gmail.com> 62014-07-02 Leo Liu <sdl.web@gmail.com>
2 7
3 * emacs-lisp/pp.el (pp-eval-expression, pp-eval-last-sexp): 8 * emacs-lisp/pp.el (pp-eval-expression, pp-eval-last-sexp):
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 8cb42dfb455..ce691748cac 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1101,7 +1101,7 @@ regardless of where you click."
1101 (unless primary 1101 (unless primary
1102 (error "No selection is available")) 1102 (error "No selection is available"))
1103 (push-mark (point)) 1103 (push-mark (point))
1104 (insert primary))) 1104 (insert-for-yank primary)))
1105 1105
1106(defun mouse-kill-ring-save (click) 1106(defun mouse-kill-ring-save (click)
1107 "Copy the region between point and the mouse click in the kill ring. 1107 "Copy the region between point and the mouse click in the kill ring.
@@ -1383,7 +1383,7 @@ regardless of where you click."
1383 (or mouse-yank-at-point (mouse-set-point click)) 1383 (or mouse-yank-at-point (mouse-set-point click))
1384 (let ((secondary (x-get-selection 'SECONDARY))) 1384 (let ((secondary (x-get-selection 'SECONDARY)))
1385 (if secondary 1385 (if secondary
1386 (insert secondary) 1386 (insert-for-yank secondary)
1387 (error "No secondary selection")))) 1387 (error "No secondary selection"))))
1388 1388
1389(defun mouse-kill-secondary () 1389(defun mouse-kill-secondary ()