From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 21 Apr 2008 02:02:01 +0000 (+0000)
Subject: (xselect-convert-to-string): Send a C_STRING only if the polymorphic
X-Git-Tag: emacs-pretest-23.0.90~6167
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=569ac23f8a6f847aa57e1ff6bd6d321391f06c32;p=emacs.git

(xselect-convert-to-string): Send a C_STRING only if the polymorphic
target TEXT is requested.
---

diff --git a/lisp/select.el b/lisp/select.el
index a283a6633b1..0a61150a06a 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -241,13 +241,12 @@ Cut buffers are considered obsolete; you should use selections instead."
 	(let ((inhibit-read-only t))
 	  ;; Suppress producing escape sequences for compositions.
 	  (remove-text-properties 0 (length str) '(composition nil) str)
-	  (if (not (multibyte-string-p str))
-	      ;; Don't have to encode unibyte string.
-	      (setq type 'C_STRING)
-	    (if (eq type 'TEXT)
-		;; TEXT is a polimorphic target.  We must select the
-		;; actual type from `UTF8_STRING', `COMPOUND_TEXT',
-		;; `STRING', and `C_STRING'.
+	  (if (eq type 'TEXT)
+	      ;; TEXT is a polymorphic target.  We must select the
+	      ;; actual type from `UTF8_STRING', `COMPOUND_TEXT',
+	      ;; `STRING', and `C_STRING'.
+	      (if (not (multibyte-string-p str))
+		  (setq type 'C_STRING)
 		(let (non-latin-1 non-unicode eight-bit)
 		  (mapc #'(lambda (x)
 			    (if (>= x #x100)
@@ -259,32 +258,32 @@ Cut buffers are considered obsolete; you should use selections instead."
 			str)
 		  (setq type (if non-unicode 'COMPOUND_TEXT
 			       (if non-latin-1 'UTF8_STRING
-				 (if eight-bit 'C_STRING 'STRING))))))
-	    (cond
-	     ((eq type 'UTF8_STRING)
-	      (if (or (not coding)
-		      (not (eq (coding-system-type coding) 'utf-8)))
-		  (setq coding 'utf-8))
-	      (setq str (encode-coding-string str coding)))
-
-	     ((eq type 'STRING)
-	      (if (or (not coding)
-		      (not (eq (coding-system-type coding) 'charset)))
-		  (setq coding 'iso-8859-1))
-	      (setq str (encode-coding-string str coding)))
-
-	     ((eq type 'COMPOUND_TEXT)
-	      (if (or (not coding)
-		      (not (eq (coding-system-type coding) 'iso-2022)))
-		  (setq coding 'compound-text-with-extensions))
-	      (setq str (encode-coding-string str coding)))
-
-	     ((eq type 'C_STRING)
-	      (setq str (string-make-unibyte str)))
-
-	     (t
-	      (error "Unknow selection type: %S" type))
-	     ))))
+				 (if eight-bit 'C_STRING 'STRING)))))))
+	  (cond
+	   ((eq type 'UTF8_STRING)
+	    (if (or (not coding)
+		    (not (eq (coding-system-type coding) 'utf-8)))
+		(setq coding 'utf-8))
+	    (setq str (encode-coding-string str coding)))
+
+	   ((eq type 'STRING)
+	    (if (or (not coding)
+		    (not (eq (coding-system-type coding) 'charset)))
+		(setq coding 'iso-8859-1))
+	    (setq str (encode-coding-string str coding)))
+
+	   ((eq type 'COMPOUND_TEXT)
+	    (if (or (not coding)
+		    (not (eq (coding-system-type coding) 'iso-2022)))
+		(setq coding 'compound-text-with-extensions))
+	    (setq str (encode-coding-string str coding)))
+
+	   ((eq type 'C_STRING)
+	    (setq str (string-make-unibyte str)))
+
+	   (t
+	    (error "Unknow selection type: %S" type))
+	   )))
 
       (setq next-selection-coding-system nil)
       (cons type str))))