aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2012-10-20 12:01:19 +0200
committerEli Zaretskii2012-10-20 12:01:19 +0200
commit2068905bb73c32afb4bb5e908b438fbd8b80bb64 (patch)
tree64786383b45240c0f06d16812d3c89411a7f5dd5 /lisp
parent4c9e95500fc913ad934e65c6625114e3f5532078 (diff)
downloademacs-2068905bb73c32afb4bb5e908b438fbd8b80bb64.tar.gz
emacs-2068905bb73c32afb4bb5e908b438fbd8b80bb64.zip
Fix bug #12395 with doc strings silently omitted from DOC on MS-Windows.
lib-src/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. lib-src/makefile.w32-in (lisp1, lisp2): Name .elc files wherever they exist. lisp/loadup.el: Update comment about uncompiled Lisp files.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/loadup.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7830f8312da..323ba976c80 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-10-20 Eli Zaretskii <eliz@gnu.org>
2
3 * loadup.el: Update comment about uncompiled Lisp files. (Bug#12395)
4
12012-10-20 Jay Belanger <jay.p.belanger@gmail.com> 52012-10-20 Jay Belanger <jay.p.belanger@gmail.com>
2 6
3 * calc/calc-units.el (math-extract-units): Properly extract powers 7 * calc/calc-units.el (math-extract-units): Properly extract powers
diff --git a/lisp/loadup.el b/lisp/loadup.el
index e0f5c6265b9..e5f2cb014d3 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -38,7 +38,8 @@
38;; doc strings in the dumped Emacs.) Because of this: 38;; doc strings in the dumped Emacs.) Because of this:
39 39
40;; ii) If the file is loaded uncompiled, it should (where possible) 40;; ii) If the file is loaded uncompiled, it should (where possible)
41;; obey the doc-string conventions expected by make-docfile. 41;; obey the doc-string conventions expected by make-docfile. It
42;; should also be added to the uncompiled[] list in make-docfile.c.
42 43
43;;; Code: 44;;; Code:
44 45