Merge from trunk.

1 files changed, 11 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2b88017fc5b..8120ab7f18d 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,6 +1,16 @@
 2012-10-20  Eli Zaretskii  <eliz@gnu.org>
 
-        Prevent silent omission of doc strings from uncompile Lisp files.
+        * make-docfile.c (IS_SLASH, DEF_ELISP_FILE): New macros.
+        (scan_lisp_file): Only pass a .el file if its basename matches a
+        known file in its entirety.  Use IS_SLASH and DEF_ELISP_FILE.
+
+2012-10-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * make-docfile.c (scan_lisp_file): Add bounds checking.
+
+2012-10-20  Eli Zaretskii  <eliz@gnu.org>
+
+        Prevent silent omission of doc strings from uncompiled Lisp files.
         * make-docfile.c (scan_lisp_file): Barf if called with a .el file
         other than one of a small list of supported un-compiled files.