diff options
| author | Paul Eggert | 2014-03-20 17:10:29 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-03-20 17:10:29 -0700 |
| commit | 1271626ab5d345cdfcd9aca1c528f6ed6152ef96 (patch) | |
| tree | 881550863a5c3923389fd6082300b976fe3e032f /src | |
| parent | a2326811fc2f460e3b1aa680c1d9784f0a5f0920 (diff) | |
| download | emacs-1271626ab5d345cdfcd9aca1c528f6ed6152ef96.tar.gz emacs-1271626ab5d345cdfcd9aca1c528f6ed6152ef96.zip | |
Backport doc.c fix from trunk.
* doc.c (store_function_docstring): Fix pointer signedness mismatch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/doc.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f67923bf417..d2572e74048 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-03-20 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * doc.c (store_function_docstring): Fix pointer signedness mismatch. | ||
| 4 | |||
| 1 | 2014-03-20 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2014-03-20 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * doc.c (store_function_docstring): Warn when we don't know where to | 7 | * doc.c (store_function_docstring): Warn when we don't know where to |
| @@ -537,7 +537,7 @@ store_function_docstring (Lisp_Object obj, ptrdiff_t offset) | |||
| 537 | ASET (fun, COMPILED_DOC_STRING, make_number (offset)); | 537 | ASET (fun, COMPILED_DOC_STRING, make_number (offset)); |
| 538 | else | 538 | else |
| 539 | message ("No docstring slot for %s", | 539 | message ("No docstring slot for %s", |
| 540 | SYMBOLP (obj) ? SDATA (SYMBOL_NAME (obj)) : "<anonymous>"); | 540 | SYMBOLP (obj) ? SSDATA (SYMBOL_NAME (obj)) : "<anonymous>"); |
| 541 | } | 541 | } |
| 542 | } | 542 | } |
| 543 | 543 | ||