Skip to content

GitLab

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

(x-cut-buffer-or-selection-value): Fix previous change.

parent ba27415c
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
lisp/term/x-win.el
View file @ dc64c739
......@@ -592,20 +592,20 @@ This is in addition to the primary selection.")
(condition-case c
(setq text (x-get-selection 'PRIMARY 'COMPOUND_TEXT))
(error nil))
(if (null text)
(condition-case c
(setq text (x-get-selection 'PRIMARY 'STRING))
(error nil)))
(if (string= text "") (setq text 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 (null text)
(condition-case c
(setq text (x-get-selection 'CLIPBOARD 'COMPOUND_TEXT))
(error nil)))
(if (null text)
(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)))
......
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