Mercurial > emacs

changeset 19178:fa3161c7360b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x-cut-buffer-or-selection-value): Fix previous change.
author Richard M. Stallman <rms@gnu.org>
date Tue, 05 Aug 1997 22:03:07 +0000
parents 31175a4bf0a6
children dce72c66de1e
files lisp/term/x-win.el
diffstat 1 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/term/x-win.el	Tue Aug 05 21:38:52 1997 +0000
+++ b/lisp/term/x-win.el	Tue Aug 05 22:03:07 1997 +0000
@@ -592,20 +592,20 @@
     (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)))