[Emacs-diffs] Changes to emacs/lisp/select.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/04/21 02:02:02

Index: select.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/select.el,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- select.el   10 Apr 2008 14:09:43 -0000      1.40
+++ select.el   21 Apr 2008 02:02:01 -0000      1.41
@@ -241,13 +241,12 @@
        (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
+             ;; 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,7 +258,7 @@
                        str)
                  (setq type (if non-unicode 'COMPOUND_TEXT
                               (if non-latin-1 'UTF8_STRING
-                                (if eight-bit 'C_STRING 'STRING))))))
+                                (if eight-bit 'C_STRING 'STRING)))))))
            (cond
             ((eq type 'UTF8_STRING)
              (if (or (not coding)
@@ -284,7 +283,7 @@
 
             (t
              (error "Unknow selection type: %S" type))
-            ))))
+          )))
 
       (setq next-selection-coding-system nil)
       (cons type str))))