diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fns.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 19f7fdcfcff..6b4660b2baf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-10-16 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * fns.c (Fstring_as_unibyte): Use xlispstrdup. | ||
| 4 | |||
| 1 | 2013-10-15 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2013-10-15 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | * print.c (print_object): Print " ..." when truncating bool vectors. | 7 | * print.c (print_object): Print " ..." when truncating bool vectors. |
| @@ -1009,11 +1009,9 @@ If STRING is multibyte and contains a character of charset | |||
| 1009 | 1009 | ||
| 1010 | if (STRING_MULTIBYTE (string)) | 1010 | if (STRING_MULTIBYTE (string)) |
| 1011 | { | 1011 | { |
| 1012 | ptrdiff_t bytes = SBYTES (string); | 1012 | unsigned char *str = xlispstrdup (string); |
| 1013 | unsigned char *str = xmalloc (bytes); | 1013 | ptrdiff_t bytes = str_as_unibyte (str, SBYTES (string)); |
| 1014 | 1014 | ||
| 1015 | memcpy (str, SDATA (string), bytes); | ||
| 1016 | bytes = str_as_unibyte (str, bytes); | ||
| 1017 | string = make_unibyte_string ((char *) str, bytes); | 1015 | string = make_unibyte_string ((char *) str, bytes); |
| 1018 | xfree (str); | 1016 | xfree (str); |
| 1019 | } | 1017 | } |