summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-03-20 17:10:29 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2014-03-20 17:10:29 -0700
commit1271626ab5d345cdfcd9aca1c528f6ed6152ef96 (patch)
tree881550863a5c3923389fd6082300b976fe3e032f
parenta2326811fc2f460e3b1aa680c1d9784f0a5f0920 (diff)
downloademacs-1271626ab5d345cdfcd9aca1c528f6ed6152ef96.tar.gz
Backport doc.c fix from trunk.
* doc.c (store_function_docstring): Fix pointer signedness mismatch.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/doc.c2
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 @@
+2014-03-20 Paul Eggert <eggert@cs.ucla.edu>
+
+ * doc.c (store_function_docstring): Fix pointer signedness mismatch.
+
2014-03-20 Stefan Monnier <monnier@iro.umontreal.ca>
* doc.c (store_function_docstring): Warn when we don't know where to
diff --git a/src/doc.c b/src/doc.c
index 7e693165c6f..b6a4cd0a27b 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -537,7 +537,7 @@ store_function_docstring (Lisp_Object obj, ptrdiff_t offset)
ASET (fun, COMPILED_DOC_STRING, make_number (offset));
else
message ("No docstring slot for %s",
- SYMBOLP (obj) ? SDATA (SYMBOL_NAME (obj)) : "<anonymous>");
+ SYMBOLP (obj) ? SSDATA (SYMBOL_NAME (obj)) : "<anonymous>");
}
}