aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2003-09-26 11:21:21 +0000
committerKenichi Handa2003-09-26 11:21:21 +0000
commit47cb11b343ce6cd48b96d85467c6db2e42e6a689 (patch)
tree060f1afe509e6b9a3982dd2db2be23264c0a7eb3 /src
parentd9130605c62bf2f147d30a960671858d3e1ef86c (diff)
downloademacs-47cb11b343ce6cd48b96d85467c6db2e42e6a689.tar.gz
emacs-47cb11b343ce6cd48b96d85467c6db2e42e6a689.zip
(concat): Don't change multibyteness of the result by
concatenating an 8-bit character.
Diffstat (limited to 'src')
-rw-r--r--src/fns.c4
1 files changed, 2 insertions, 2 deletions
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)
591 wrong_type_argument (Qcharacterp, ch); 591 wrong_type_argument (Qcharacterp, ch);
592 this_len_byte = CHAR_BYTES (XINT (ch)); 592 this_len_byte = CHAR_BYTES (XINT (ch));
593 result_len_byte += this_len_byte; 593 result_len_byte += this_len_byte;
594 if (! ASCII_CHAR_P (XINT (ch))) 594 if (! ASCII_CHAR_P (XINT (ch)) && ! CHAR_BYTE8_P (XINT (ch)))
595 some_multibyte = 1; 595 some_multibyte = 1;
596 } 596 }
597 else if (BOOL_VECTOR_P (this) && XBOOL_VECTOR (this)->size > 0) 597 else if (BOOL_VECTOR_P (this) && XBOOL_VECTOR (this)->size > 0)
@@ -604,7 +604,7 @@ concat (nargs, args, target_type, last_special)
604 wrong_type_argument (Qcharacterp, ch); 604 wrong_type_argument (Qcharacterp, ch);
605 this_len_byte = CHAR_BYTES (XINT (ch)); 605 this_len_byte = CHAR_BYTES (XINT (ch));
606 result_len_byte += this_len_byte; 606 result_len_byte += this_len_byte;
607 if (! ASCII_CHAR_P (XINT (ch))) 607 if (! ASCII_CHAR_P (XINT (ch)) && ! CHAR_BYTE8_P (XINT (ch)))
608 some_multibyte = 1; 608 some_multibyte = 1;
609 } 609 }
610 else if (STRINGP (this)) 610 else if (STRINGP (this))