[Emacs-diffs] /srv/bzr/emacs/trunk r102167: Don't use STRING as first choice when pasting PRIMARY (Bug#6802).

[Jan D.]

------------------------------------------------------------
revno: 102167
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-31 17:03:11 +0100
message:
  Don't use STRING as first choice when pasting PRIMARY (Bug#6802).
  
  * lisp/term/x-win.el (x-get-selection-value): New function that gets
  PRIMARY with type as specified in x-select-request-type. (Bug#6802).
modified:
  lisp/ChangeLog
  lisp/term/x-win.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-31 14:40:01 +0000
+++ b/lisp/ChangeLog    2010-10-31 16:03:11 +0000
@@ -1,3 +1,8 @@
+2010-10-31  Jan Djärv  <address@hidden>
+
+       * term/x-win.el (x-get-selection-value): New function that gets
+       PRIMARY with type as specified in x-select-request-type. (Bug#6802).
+
 2010-10-31  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-handle-insert-file-contents): For root,

=== modified file 'lisp/term/x-win.el'
--- a/lisp/term/x-win.el        2010-10-24 22:04:45 +0000
+++ b/lisp/term/x-win.el        2010-10-31 16:03:11 +0000
@@ -1279,6 +1279,13 @@
 (setq interprogram-cut-function 'x-select-text)
 (setq interprogram-paste-function 'x-selection-value)
 
+;; Make paste from other applications use the decoding in x-select-request-type
+;; and not just STRING.
+(defun x-get-selection-value ()
+  "Get the current value of the PRIMARY selection.
+Request data types in the order specified by `x-select-request-type'."
+  (x-selection-value-internal 'PRIMARY))
+
 (defun x-clipboard-yank ()
   "Insert the clipboard contents, or the last stretch of killed text."
   (interactive "*")