Mercurial > emacs
changeset 111264:238b8ef4506c
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).
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Sun, 31 Oct 2010 17:03:11 +0100 |
| parents | e7b46fb5cc2b |
| children | d2e4336159e8 |
| files | lisp/ChangeLog lisp/term/x-win.el |
| diffstat | 2 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Oct 31 10:41:32 2010 -0400 +++ b/lisp/ChangeLog Sun Oct 31 17:03:11 2010 +0100 @@ -1,3 +1,8 @@ +2010-10-31 Jan Djärv <jan.h.d@swipnet.se> + + * 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 <michael.albinus@gmx.de> * net/tramp.el (tramp-handle-insert-file-contents): For root,
--- a/lisp/term/x-win.el Sun Oct 31 10:41:32 2010 -0400 +++ b/lisp/term/x-win.el Sun Oct 31 17:03:11 2010 +0100 @@ -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 "*")