From dc64c73985460065cc9fdb607cfec25530755009 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 5 Aug 1997 22:03:07 +0000 Subject: [PATCH] (x-cut-buffer-or-selection-value): Fix previous change. --- lisp/term/x-win.el | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 2a09302e19b..1557a6dd5bf 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -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))) -- 2.39.2