[Emacs-diffs] /srv/bzr/emacs/trunk r101080: Fix bug #6689 with mouse-2 pasting on Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 101080
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2010-08-14 18:41:22 +0300
message:
  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.
modified:
  lisp/ChangeLog
  lisp/mouse.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-08-13 13:26:13 +0000
+++ b/lisp/ChangeLog    2010-08-14 15:41:22 +0000
@@ -1,3 +1,8 @@
+2010-08-14  Eli Zaretskii  <address@hidden>
+
+       * mouse.el (mouse-yank-primary): Fix mouse-2 on MS-Windows and
+       MS-DOS.  (Bug#6689)
+
 2010-08-13  Jan Djärv  <address@hidden>
 
        * menu-bar.el (menu-bar-set-tool-bar-position): New function.

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2010-08-08 21:57:34 +0000
+++ b/lisp/mouse.el     2010-08-14 15:41:22 +0000
@@ -1265,10 +1265,17 @@
     ;; 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.