upstream

3 files changed, 14 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index bcb71daca5d..c88b467ee29 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,12 @@
+2012-10-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (lisp2): Add cp51932.el and eucjp-ms.el, to
+        follow src/lisp.mk.
+
+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.
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index b6cd1530a4c..68e7029ee85 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1118,7 +1118,9 @@ scan_lisp_file (const char *filename, const char *mode)
   } const uncompiled[] = {
     DEF_ELISP_FILE (loaddefs.el),
     DEF_ELISP_FILE (loadup.el),
-    DEF_ELISP_FILE (charprop.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);
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 640e8a7c468..f3ab4421fd3 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -229,6 +229,8 @@ lisp2 = \
         $(lispsource)language/greek.elc \
         $(lispsource)language/hebrew.elc \
         $(lispsource)language/japanese.elc \
+        $(lispsource)international/cp51932.el \
+        $(lispsource)international/eucjp-ms.el \
         $(lispsource)language/korean.elc \
         $(lispsource)language/lao.elc \
         $(lispsource)language/cham.elc \