mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-07 15:21:46 +00:00
Code Issues Releases Activity

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

Browse Source 
mouse.el (mouse-yank-primary): On MS-Windows and MS-DOS, call
 x-get-selection-value in preference to x-get-selection.
This commit is contained in:
Eli Zaretskii 2010-08-14 18:41:22 +03:00
parent b236615c10
commit e7afcf30cd
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
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.

11
lisp/mouse.el
View File

@ -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.