diff options
| author | Paul Eggert | 2011-06-06 23:09:32 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-06 23:09:32 -0700 |
| commit | 353032ce71627010043aba9d536a3e739894a1d2 (patch) | |
| tree | f01cebee1baa96d709003b95f26bb878ffaf6439 /src | |
| parent | 2bccce07c2b7d1aadbe6bd5a630540c7e4b252e2 (diff) | |
| download | emacs-353032ce71627010043aba9d536a3e739894a1d2.tar.gz emacs-353032ce71627010043aba9d536a3e739894a1d2.zip | |
* character.c (string_escape_byte8): Fix nbytes/nchars typo.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/character.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6d163f56c1e..b05b3603c0d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-06-07 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-06-07 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * character.c (string_escape_byte8): Fix nbytes/nchars typo. | ||
| 4 | |||
| 3 | * alloc.c (Fmake_string): Check for out-of-range init. | 5 | * alloc.c (Fmake_string): Check for out-of-range init. |
| 4 | 6 | ||
| 5 | 2011-06-07 Daniel Colascione <dan.colascione@gmail.com> | 7 | 2011-06-07 Daniel Colascione <dan.colascione@gmail.com> |
diff --git a/src/character.c b/src/character.c index 170952619e7..fe8be7084f0 100644 --- a/src/character.c +++ b/src/character.c | |||
| @@ -847,7 +847,7 @@ string_escape_byte8 (Lisp_Object string) | |||
| 847 | } | 847 | } |
| 848 | else | 848 | else |
| 849 | { | 849 | { |
| 850 | if ((STRING_BYTES_MAX - nchars) / 3 < byte8_count) | 850 | if ((STRING_BYTES_MAX - nbytes) / 3 < byte8_count) |
| 851 | string_overflow (); | 851 | string_overflow (); |
| 852 | 852 | ||
| 853 | /* Convert 1-byte sequence of byte8 chars to 4-byte octal. */ | 853 | /* Convert 1-byte sequence of byte8 chars to 4-byte octal. */ |