3 files changed, 86 insertions, 26 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 1f28000e110..bc0e5c9a3d2 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,26 @@
+2012-10-21  Glenn Morris  <rgm@gnu.org>
+
+        * make-docfile.c (scan_lisp_file): Add cp51932.el and eucjp-ms.el.
+
+2012-10-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * 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.
+
+        * makefile.w32-in (lisp1, lisp2): Name .elc files wherever they
+        exist.  (Bug#12395)
+
 2012-10-17  Eli Zaretskii  <eliz@gnu.org>
 
         * ntlib.c: Include <mbstring.h>, to avoid compiler warning about
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 411b7057861..68e7029ee85 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -58,9 +58,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef chdir
 #define READ_TEXT "rt"
 #define READ_BINARY "rb"
+#define IS_SLASH(c)  ((c) == '/' || (c) == '\\' || (c) == ':')
 #else  /* not DOS_NT */
 #define READ_TEXT "r"
 #define READ_BINARY "r"
+#define IS_SLASH(c)  ((c) == '/')
 #endif /* not DOS_NT */
 
 static int scan_file (char *filename);
@@ -1025,9 +1027,9 @@ scan_c_file (char *filename, const char *mode)
  arglist, but the doc string must still have a backslash and newline
  immediately after the double quote.
  The only source files that must follow this convention are preloaded
- uncompiled ones like loaddefs.el and bindings.el; aside
- from that, it is always the .elc file that we look at, and they are no
- problem because byte-compiler output follows this convention.
+ uncompiled ones like loaddefs.el; aside from that, it is always the .elc
+ file that we should look at, and they are no problem because byte-compiler
+ output follows this convention.
  The NAME and DOCSTRING are output.
  NAME is preceded by `F' for a function or `V' for a variable.
  An entry is output only if DOCSTRING has \ newline just after the opening ".
@@ -1098,15 +1100,50 @@ search_lisp_doc_at_eol (FILE *infile)
   return 1;
 }
 
+#define DEF_ELISP_FILE(fn)  { #fn, sizeof(#fn) - 1 }
+
 static int
 scan_lisp_file (const char *filename, const char *mode)
 {
   FILE *infile;
   register int c;
   char *saved_string = 0;
+  /* These are the only files that are loaded uncompiled, and must
+     follow the conventions of the doc strings expected by this
+     function.  These conventions are automatically followed by the
+     byte compiler when it produces the .elc files.  */
+  static struct {
+    const char *fn;
+    size_t fl;
+  } const uncompiled[] = {
+    DEF_ELISP_FILE (loaddefs.el),
+    DEF_ELISP_FILE (loadup.el),
+    DEF_ELISP_FILE (charprop.el),
+    DEF_ELISP_FILE (cp51932.el),
+    DEF_ELISP_FILE (eucjp-ms.el)
+  };
+  int i, match;
+  size_t flen = strlen (filename);
 
   if (generate_globals)
     fatal ("scanning lisp file when -g specified", 0);
+  if (flen > 3 && !strcmp (filename + flen - 3, ".el"))
+    {
+      for (i = 0, match = 0; i < sizeof (uncompiled) / sizeof (uncompiled[0]);
+           i++)
+        {
+          if (uncompiled[i].fl <= flen
+              && !strcmp (filename + flen - uncompiled[i].fl, uncompiled[i].fn)
+              && (flen == uncompiled[i].fl
+                  || IS_SLASH (filename[flen - uncompiled[i].fl - 1])))
+            {
+              match = 1;
+              break;
+            }
+        }
+      if (!match)
+        fatal ("uncompiled lisp file %s is not supported", filename);
+    }
 
   infile = fopen (filename, mode);
   if (infile == NULL)
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index ecc5fb866b3..640e8a7c468 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -209,38 +209,38 @@ lisp1= \
         $(lispsource)emacs-lisp/map-ynp.elc \
         $(lispsource)menu-bar.elc \
         $(lispsource)international/mule.elc \
-        $(lispsource)international/mule-conf.el \
+        $(lispsource)international/mule-conf.elc \
         $(lispsource)international/mule-cmds.elc \
         $(lispsource)international/characters.elc \
         $(lispsource)international/charprop.el \
         $(lispsource)case-table.elc
 
 lisp2 = \
-        $(lispsource)language/chinese.el \
-        $(lispsource)language/cyrillic.el \
-        $(lispsource)language/indian.el \
-        $(lispsource)language/sinhala.el \
-        $(lispsource)language/english.el \
+        $(lispsource)language/chinese.elc \
+        $(lispsource)language/cyrillic.elc \
+        $(lispsource)language/indian.elc \
+        $(lispsource)language/sinhala.elc \
+        $(lispsource)language/english.elc \
         $(lispsource)language/ethiopic.elc \
         $(lispsource)language/european.elc \
-        $(lispsource)language/czech.el \
-        $(lispsource)language/slovak.el \
-        $(lispsource)language/romanian.el \
-        $(lispsource)language/greek.el \
+        $(lispsource)language/czech.elc \
+        $(lispsource)language/slovak.elc \
+        $(lispsource)language/romanian.elc \
+        $(lispsource)language/greek.elc \
         $(lispsource)language/hebrew.elc \
-        $(lispsource)language/japanese.el \
-        $(lispsource)language/korean.el \
-        $(lispsource)language/lao.el \
-        $(lispsource)language/cham.el \
-        $(lispsource)language/tai-viet.el \
-        $(lispsource)language/thai.el \
+        $(lispsource)language/japanese.elc \
+        $(lispsource)language/korean.elc \
+        $(lispsource)language/lao.elc \
+        $(lispsource)language/cham.elc \
+        $(lispsource)language/tai-viet.elc \
+        $(lispsource)language/thai.elc \
         $(lispsource)language/tibetan.elc \
-        $(lispsource)language/vietnamese.el \
-        $(lispsource)language/misc-lang.el \
-        $(lispsource)language/utf-8-lang.el \
-        $(lispsource)language/georgian.el \
-        $(lispsource)language/khmer.el \
-        $(lispsource)language/burmese.el \
+        $(lispsource)language/vietnamese.elc \
+        $(lispsource)language/misc-lang.elc \
+        $(lispsource)language/utf-8-lang.elc \
+        $(lispsource)language/georgian.elc \
+        $(lispsource)language/khmer.elc \
+        $(lispsource)language/burmese.elc \
         $(lispsource)register.elc \
         $(lispsource)replace.elc \
         $(lispsource)simple.elc \
@@ -266,7 +266,7 @@ lisp2 = \
         $(WINDOW_SUPPORT) \
         $(lispsource)widget.elc \
         $(lispsource)window.elc \
-        $(lispsource)version.el
+        $(lispsource)version.elc
 
 # This is needed the first time we build the tree, since temacs.exe
 # does not exist yet, and the DOC rule needs it to rebuild DOC whenever