aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa1998-04-09 05:40:23 +0000
committerKenichi Handa1998-04-09 05:40:23 +0000
commitd121936ff01c95989a3dcd173f8f16dcb470da19 (patch)
treecda1ed96dfab31583bc3d924e3aac5fb3b0171c3
parenta2c983d55c378252029596e613f07da292da11ef (diff)
downloademacs-d121936ff01c95989a3dcd173f8f16dcb470da19.tar.gz
emacs-d121936ff01c95989a3dcd173f8f16dcb470da19.zip
(MULTIBYTE_FORM_LENGTH): Don't check LEN here.
-rw-r--r--src/charset.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/charset.h b/src/charset.h
index 5ee27bf9003..9645db2a054 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -612,10 +612,9 @@ else
612 612
613/* Return the length of the multi-byte form at string STR of length LEN. */ 613/* Return the length of the multi-byte form at string STR of length LEN. */
614 614
615#define MULTIBYTE_FORM_LENGTH(str, len) \ 615#define MULTIBYTE_FORM_LENGTH(str, len) \
616 ((BYTES_BY_CHAR_HEAD (*(unsigned char *)(str)) == 1 \ 616 (BYTES_BY_CHAR_HEAD (*(unsigned char *)(str)) == 1 \
617 || BYTES_BY_CHAR_HEAD (*(unsigned char *)(str)) > (len)) \ 617 ? 1 \
618 ? 1 \
619 : multibyte_form_length (str, len)) 618 : multibyte_form_length (str, len))
620 619
621/* Set C a (possibly multibyte) character at P. P points into a 620/* Set C a (possibly multibyte) character at P. P points into a