diff options
| author | Ken Raeburn | 2009-08-10 00:57:48 +0000 |
|---|---|---|
| committer | Ken Raeburn | 2009-08-10 00:57:48 +0000 |
| commit | 77437343067af467cab2c8925d2e86a769701feb (patch) | |
| tree | ea3a21cdda43b8748d56999cc92819e286d325cb /src | |
| parent | f0bed503c49017428a416fcf464e0a2216880498 (diff) | |
| download | emacs-77437343067af467cab2c8925d2e86a769701feb.tar.gz emacs-77437343067af467cab2c8925d2e86a769701feb.zip | |
(concat): Don't re-set string length to its current value.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/fns.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7872fec0d99..935555f5b6b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2009-08-10 Ken Raeburn <raeburn@raeburn.org> | 1 | 2009-08-10 Ken Raeburn <raeburn@raeburn.org> |
| 2 | 2 | ||
| 3 | * fns.c (concat): Don't re-set string length to its current | ||
| 4 | value. | ||
| 5 | |||
| 3 | * coding.h (decode_coding_string, encode_coding_string): Use | 6 | * coding.h (decode_coding_string, encode_coding_string): Use |
| 4 | SBYTES macro. | 7 | SBYTES macro. |
| 5 | 8 | ||
| @@ -661,7 +661,6 @@ concat (nargs, args, target_type, last_special) | |||
| 661 | } | 661 | } |
| 662 | toindex_byte += thislen_byte; | 662 | toindex_byte += thislen_byte; |
| 663 | toindex += thisleni; | 663 | toindex += thisleni; |
| 664 | STRING_SET_CHARS (val, SCHARS (val)); | ||
| 665 | } | 664 | } |
| 666 | /* Copy a single-byte string to a multibyte string. */ | 665 | /* Copy a single-byte string to a multibyte string. */ |
| 667 | else if (STRINGP (this) && STRINGP (val)) | 666 | else if (STRINGP (this) && STRINGP (val)) |