From: Kenichi Handa <handa@m17n.org>
Date: Fri, 26 Sep 2003 11:21:21 +0000 (+0000)
Subject: (concat): Don't change multibyteness of the result by
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1821
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=47cb11b343ce6cd48b96d85467c6db2e42e6a689;p=emacs.git

(concat): Don't change multibyteness of the result by
concatenating an 8-bit character.
---

diff --git a/src/fns.c b/src/fns.c
index 0fdca30084e..2c458ba1766 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -591,7 +591,7 @@ concat (nargs, args, target_type, last_special)
 		  wrong_type_argument (Qcharacterp, ch);
 		this_len_byte = CHAR_BYTES (XINT (ch));
 		result_len_byte += this_len_byte;
-		if (! ASCII_CHAR_P (XINT (ch)))
+		if (! ASCII_CHAR_P (XINT (ch)) && ! CHAR_BYTE8_P (XINT (ch)))
 		  some_multibyte = 1;
 	      }
 	  else if (BOOL_VECTOR_P (this) && XBOOL_VECTOR (this)->size > 0)
@@ -604,7 +604,7 @@ concat (nargs, args, target_type, last_special)
 		  wrong_type_argument (Qcharacterp, ch);
 		this_len_byte = CHAR_BYTES (XINT (ch));
 		result_len_byte += this_len_byte;
-		if (! ASCII_CHAR_P (XINT (ch)))
+		if (! ASCII_CHAR_P (XINT (ch)) && ! CHAR_BYTE8_P (XINT (ch)))
 		  some_multibyte = 1;
 	      }
 	  else if (STRINGP (this))