Commit 8ba13581 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(x-cut-buffer-or-selection-value): Try both

COMPOUND_TEXT and STRING as types for the selection.
parent 4ab455e6
......@@ -590,15 +590,24 @@ This is in addition to the primary selection.")
;; Don't die if x-get-selection signals an error.
(condition-case c
(setq text (x-get-selection 'PRIMARY))
(setq text (x-get-selection 'PRIMARY 'COMPOUND_TEXT))
(error nil))
(if (string= text "") (setq text nil))
(if x-select-enable-clipboard
(condition-case c
(setq text (x-get-selection 'CLIPBOARD))
(error nil)))
(condition-case c
(setq text (x-get-selection 'PRIMARY 'STRING))
(error nil))
(if (string= text "") (setq text nil))
(when x-select-enable-clipboard
(condition-case c
(setq text (x-get-selection 'CLIPBOARD 'COMPOUND_TEXT))
(error nil))
(if (string= text "") (setq text nil))
(condition-case c
(setq text (x-get-selection 'CLIPBOARD 'STRING))
(error nil))
(if (string= text "") (setq text nil)))
(or text (setq text (x-get-cut-buffer 0)))
(if (string= text "") (setq text nil))
......
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