[Emacs-diffs] emacs/src coding.h [EMACS_23_1_RC]

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Eli Zaretskii <eliz>    09/08/22 10:32:24

Modified files:
        src            : coding.h 

Log message:
        (encode_coding_string): Don't encode unibyte strings.  (Bug#4047)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/coding.h?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.96.2.1&r2=1.96.2.2

Patches:
Index: coding.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/coding.h,v
retrieving revision 1.96.2.1
retrieving revision 1.96.2.2
diff -u -b -r1.96.2.1 -r1.96.2.2
--- coding.h    8 Jul 2009 02:25:19 -0000       1.96.2.1
+++ coding.h    22 Aug 2009 10:32:24 -0000      1.96.2.2
@@ -738,10 +738,10 @@
                        STRING_BYTES (XSTRING (string)), Qt)
 
 #define encode_coding_string(coding, string, nocopy)                   \
-  (encode_coding_object (coding, string, 0, 0, XSTRING (string)->size, \
-                        STRING_BYTES (XSTRING (string)), Qt),          \
-   (coding)->dst_object)
-
+  (STRING_MULTIBYTE(string) ?                                          \
+    (encode_coding_object (coding, string, 0, 0, SCHARS (string),      \
+                          SBYTES (string), Qt),                        \
+     (coding)->dst_object) : (string))
 
 #define decode_coding_c_string(coding, src, bytes, dst_object)         \
   do {                                                                 \