diff options
| author | Richard M. Stallman <rms@gnu.org> | 1997-08-05 22:03:07 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1997-08-05 22:03:07 +0000 |
| commit | 25f2605907905d952fe38cba6bc48162bb0d608d (patch) | |
| tree | 2a48ae5bc2755396702f48a4629ce968fb954298 /lisp/term | |
| parent | 4e7993f70ae12135b9a8b0d75222118252fe3f14 (diff) | |
| download | emacs-25f2605907905d952fe38cba6bc48162bb0d608d.tar.gz | |
(x-cut-buffer-or-selection-value): Fix previous change.
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/x-win.el | 24 |
1 files 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))) |