diff options
| author | Kenichi Handa | 2013-03-10 23:43:58 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2013-03-10 23:43:58 +0900 |
| commit | a6ebf83d9065b9b32231cd544d70195fb7ba97ae (patch) | |
| tree | 06e464d66548640726c95710c386a9d0b7e4edd2 /src/coding.c | |
| parent | c230dd7d89730f565df77046d0666d2082e386ee (diff) | |
| parent | 45ba025e53f8d91f7b46dfabafa5c8aafe4906dc (diff) | |
| download | emacs-a6ebf83d9065b9b32231cd544d70195fb7ba97ae.tar.gz emacs-a6ebf83d9065b9b32231cd544d70195fb7ba97ae.zip | |
merge trunk
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index f33b5e7c7d5..98af4ddcef7 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -8005,7 +8005,7 @@ wchar_t * | |||
| 8005 | to_unicode (Lisp_Object str, Lisp_Object *buf) | 8005 | to_unicode (Lisp_Object str, Lisp_Object *buf) |
| 8006 | { | 8006 | { |
| 8007 | *buf = code_convert_string_norecord (str, Qutf_16le, 1); | 8007 | *buf = code_convert_string_norecord (str, Qutf_16le, 1); |
| 8008 | /* We need to make a another copy (in addition to the one made by | 8008 | /* We need to make another copy (in addition to the one made by |
| 8009 | code_convert_string_norecord) to ensure that the final string is | 8009 | code_convert_string_norecord) to ensure that the final string is |
| 8010 | _doubly_ zero terminated --- that is, that the string is | 8010 | _doubly_ zero terminated --- that is, that the string is |
| 8011 | terminated by two zero bytes and one utf-16le null character. | 8011 | terminated by two zero bytes and one utf-16le null character. |