summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/doc.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 93d1ba247b1..f67923bf417 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
2014-03-20 Stefan Monnier <monnier@iro.umontreal.ca>
+ * doc.c (store_function_docstring): Warn when we don't know where to
+ put a docstring.
+ (Fsubstitute_command_keys): Don't advertise the fact that
+ text-properties are dropped, since we think it's a bug that we'll fix
+ in 24.5.
+
* frame.h (SET_FRAME_VISIBLE): Keep frame_garbaged up to date.
* xterm.c (handle_one_xevent) <MapNotify>: Don't garbage the frame.
* frame.c (frame_garbaged): Make "docstring" more precise.
diff --git a/src/doc.c b/src/doc.c
index a42874f4503..7e693165c6f 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -535,6 +535,9 @@ store_function_docstring (Lisp_Object obj, ptrdiff_t offset)
docstring, since we've found a docstring for it. */
if ((ASIZE (fun) & PSEUDOVECTOR_SIZE_MASK) > COMPILED_DOC_STRING)
ASET (fun, COMPILED_DOC_STRING, make_number (offset));
+ else
+ message ("No docstring slot for %s",
+ SYMBOLP (obj) ? SDATA (SYMBOL_NAME (obj)) : "<anonymous>");
}
}
@@ -707,7 +710,7 @@ as the keymap for future \\=\\[COMMAND] substrings.
thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output.
Return the original STRING if no substitutions are made.
-Otherwise, return a new string, without any text properties. */)
+Otherwise, return a new string. */)
(Lisp_Object string)
{
char *buf;