Commit e7afcf30 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix bug #6689 with mouse-2 pasting on Windows.

 mouse.el (mouse-yank-primary): On MS-Windows and MS-DOS, call
 x-get-selection-value in preference to x-get-selection.
parent b236615c
2010-08-14 Eli Zaretskii <eliz@gnu.org>
* mouse.el (mouse-yank-primary): Fix mouse-2 on MS-Windows and
MS-DOS. (Bug#6689)
2010-08-13 Jan Djärv <jan.h.d@swipnet.se>
 
* menu-bar.el (menu-bar-set-tool-bar-position): New function.
......
......@@ -1265,10 +1265,17 @@ regardless of where you click."
;; the middle of an active region.
(deactivate-mark))
(or mouse-yank-at-point (mouse-set-point click))
(let ((primary (x-get-selection 'PRIMARY)))
(let ((primary
(cond
((fboundp 'x-get-selection-value) ; MS-DOS and MS-Windows
(or (x-get-selection-value)
(x-get-selection 'PRIMARY)))
;; FIXME: What about xterm-mouse-mode etc.?
(t
(x-get-selection 'PRIMARY)))))
(if primary
(insert primary)
(error "No primary selection"))))
(error "No selection is available"))))
(defun mouse-kill-ring-save (click)
"Copy the region between point and the mouse click in the kill ring.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment