# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 870659616 0
# Node ID 3940bb7f551507b2a96d355bde7128ae57dbad7f
# Parent  e561070ee48c245277126bf2b248bd5d6d34a8df
(x-cut-buffer-or-selection-value): Try both
COMPOUND_TEXT and STRING as types for the selection.

diff -r e561070ee48c -r 3940bb7f5515 lisp/term/x-win.el
--- a/lisp/term/x-win.el	Mon Aug 04 01:42:50 1997 +0000
+++ b/lisp/term/x-win.el	Mon Aug 04 01:53:36 1997 +0000
@@ -590,15 +590,24 @@
 
     ;; Don't die if x-get-selection signals an error.
     (condition-case c
-	(setq text (x-get-selection 'PRIMARY))
+	(setq text (x-get-selection 'PRIMARY 'COMPOUND_TEXT))
+      (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))
 
-    (if x-select-enable-clipboard
-	(condition-case c
-	    (setq text (x-get-selection 'CLIPBOARD))
-	  (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 (string= text "") (setq text nil)))
+
     (or text (setq text (x-get-cut-buffer 0)))
     (if (string= text "") (setq text nil))