From: Richard M. Stallman Date: Tue, 5 Aug 1997 22:03:07 +0000 (+0000) Subject: (x-cut-buffer-or-selection-value): Fix previous change. X-Git-Tag: emacs-20.1~768 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc64c73985460065cc9fdb607cfec25530755009;p=emacs.git (x-cut-buffer-or-selection-value): Fix previous change. --- 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)))