From: Jan Djärv Date: Sun, 31 Oct 2010 16:03:11 +0000 (+0100) Subject: Don't use STRING as first choice when pasting PRIMARY (Bug#6802). X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~422^2~41 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=04e6379658b7d4ac14fc829064be879a8c4f82e9;p=emacs.git 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). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 61a23268f41..9b812b00d66 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-10-31 Jan Djärv + + * 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 * net/tramp.el (tramp-handle-insert-file-contents): For root, diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index bd426012532..afb706ab972 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -1279,6 +1279,13 @@ The value nil is the same as this list: (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 "*")