diff options
| author | Paul Eggert | 2011-06-12 19:09:34 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-12 19:09:34 -0700 |
| commit | 684a03ef99ead5f4743f8c612acf7664674224ec (patch) | |
| tree | 00d817eea84a6b6056c23effb7c175414d66e3de /src | |
| parent | 0fed43f396ce7838bdc591cec8b01be95fb9613a (diff) | |
| download | emacs-684a03ef99ead5f4743f8c612acf7664674224ec.tar.gz emacs-684a03ef99ead5f4743f8c612acf7664674224ec.zip | |
* doc.c (get_doc_string): Omit (unsigned)c that mishandled negatives.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/doc.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9b0ff3e7339..9196367d195 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-06-13 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-06-13 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * doc.c (get_doc_string): Omit (unsigned)c that mishandled negatives. | ||
| 4 | |||
| 3 | * data.c (Faset): If ARRAY is a string, check that NEWELT is a char. | 5 | * data.c (Faset): If ARRAY is a string, check that NEWELT is a char. |
| 4 | Without this fix, on a 64-bit host (aset S 0 4294967386) would | 6 | Without this fix, on a 64-bit host (aset S 0 4294967386) would |
| 5 | incorrectly succeed when S was a string, because 4294967386 was | 7 | incorrectly succeed when S was a string, because 4294967386 was |
| @@ -253,9 +253,12 @@ get_doc_string (Lisp_Object filepos, int unibyte, int definition) | |||
| 253 | else if (c == '_') | 253 | else if (c == '_') |
| 254 | *to++ = 037; | 254 | *to++ = 037; |
| 255 | else | 255 | else |
| 256 | error ("\ | 256 | { |
| 257 | unsigned char uc = c; | ||
| 258 | error ("\ | ||
| 257 | Invalid data in documentation file -- %c followed by code %03o", | 259 | Invalid data in documentation file -- %c followed by code %03o", |
| 258 | 1, (unsigned)c); | 260 | 1, uc); |
| 261 | } | ||
| 259 | } | 262 | } |
| 260 | else | 263 | else |
| 261 | *to++ = *from++; | 264 | *to++ = *from++; |