diff options
| author | Richard M. Stallman <rms@gnu.org> | 1998-01-21 21:43:30 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1998-01-21 21:43:30 +0000 |
| commit | d95e5ab63414da8f8da281fbc611bcaeca1504af (patch) | |
| tree | 237c4ea54b31db526b53463f8082f4a880d44115 /src | |
| parent | e4dc15be09dddfab7b80c5fcb50d513df455efaa (diff) | |
| download | emacs-d95e5ab63414da8f8da281fbc611bcaeca1504af.tar.gz | |
(concat): Use unibyte_char_to_multibyte.
Fix lossage in installing previous patch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fns.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/fns.c b/src/fns.c index eb2c2cbcbc0..64c6778aea4 100644 --- a/src/fns.c +++ b/src/fns.c @@ -473,7 +473,7 @@ concat (nargs, args, target_type, last_special) } else if (STRINGP (this)) { - result_len_byte += XSTRING (this)->size_byte; + if (STRING_MULTIBYTE (this)) { some_multibyte = 1; result_len_byte += XSTRING (this)->size_byte; @@ -572,17 +572,9 @@ concat (nargs, args, target_type, last_special) { unsigned char c; XSETFASTINT (elt, XSTRING (this)->data[thisindex++]); - if (some_multibyte && XINT (elt) >= 0200 - && XINT (elt) < 0400) - { - c = XINT (elt); - if (nonascii_insert_offset > 0) - c += nonascii_insert_offset; - else - c += DEFAULT_NONASCII_INSERT_OFFSET; - - XSETINT (elt, c); - } + if (some_multibyte) + XSETINT (elt, + unibyte_char_to_multibyte (XINT (elt))); } } else if (BOOL_VECTOR_P (this)) |