mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-30 08:09:04 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Richard M. Stallman 1997-08-05 22:03:07 +00:00
parent ba27415c3e
commit dc64c73985
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lisp/term/x-win.el
View File

@ -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)))