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

Fix bug #7699 with pasting selected text on MS-Windows.

 mouse.el (mouse-yank-primary): On MS-Windows, try the (emulated)
 PRIMARY first, then the clipboard.
parent 36de6a04
2010-12-25 Eli Zaretskii <eliz@gnu.org>
* mouse.el (mouse-yank-primary): On MS-Windows, try the (emulated)
PRIMARY first, then the clipboard. (Bug#7699)
2010-12-22 Stefan Monnier <monnier@iro.umontreal.ca>
 
* emacs-lisp/bytecomp.el (byte-compile-output-docform): Fix up use of
......
......@@ -1282,7 +1282,16 @@ regardless of where you click."
(or mouse-yank-at-point (mouse-set-point click))
(let ((primary
(cond
((fboundp 'x-get-selection-value) ; MS-DOS, MS-Windows and X.
((eq system-type 'windows-nt)
;; MS-Windows emulates PRIMARY in x-get-selection, but not
;; in x-get-selection-value (the latter only accesses the
;; clipboard). So try PRIMARY first, in case they selected
;; something with the mouse in the current Emacs session.
(or (x-get-selection 'PRIMARY)
(x-get-selection-value)))
((fboundp 'x-get-selection-value) ; MS-DOS and X.
;; On X, x-get-selection-value supports more formats and
;; encodings, so use it in preference to x-get-selection.
(or (x-get-selection-value)
(x-get-selection 'PRIMARY)))
;; FIXME: What about xterm-mouse-mode etc.?
......
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