aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2022-01-03 15:04:12 -0500
committerStefan Monnier2022-01-03 15:04:12 -0500
commit460f35e96df1c39ce2ba0f424b36365a2f9e9825 (patch)
tree28398a961fccf9538114174b32d96f5dd918043a /src
parentab5ee3e29e916d4009b301841e9780aad564a6a0 (diff)
downloademacs-460f35e96df1c39ce2ba0f424b36365a2f9e9825.tar.gz
emacs-460f35e96df1c39ce2ba0f424b36365a2f9e9825.zip
Revert part of 59732a83c8 to fix bug#52969
While we don't need to put docstrings of .elc files into etc/DOC, we still need to put those of `loaddefs.el` there since we don't have a "dynamic docstring" feature for the non-compiled files and keeping the actual docstrings in the heap would be prohibitive. * src/Makefile.in ($(etc)/DOC): Scan `lisp/loaddefs.el` still. * lib-src/make-docfile.c (scan_lisp_file): New function. (scan_file): Use it. (skip_white, read_lisp_symbol, search_lisp_doc_at_eol): New functions.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 6379582660c..83210b1317a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -642,11 +642,13 @@ endif
642## for the first time, this prevents any variation between configurations 642## for the first time, this prevents any variation between configurations
643## in the contents of the DOC file. 643## in the contents of the DOC file.
644## 644##
645$(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(doc_obj) 645$(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(doc_obj) $(lispsource)/loaddefs.el
646 $(AM_V_GEN)$(MKDIR_P) $(etc) 646 $(AM_V_GEN)$(MKDIR_P) $(etc)
647 $(AM_V_at)rm -f $(etc)/DOC 647 $(AM_V_at)rm -f $(etc)/DOC
648 $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \ 648 $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \
649 $(SOME_MACHINE_OBJECTS) $(doc_obj) > $(etc)/DOC 649 $(SOME_MACHINE_OBJECTS) $(doc_obj) > $(etc)/DOC
650 $(AM_V_at)$(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) \
651 loaddefs.el
650 652
651$(libsrc)/make-docfile$(EXEEXT) $(libsrc)/make-fingerprint$(EXEEXT): \ 653$(libsrc)/make-docfile$(EXEEXT) $(libsrc)/make-fingerprint$(EXEEXT): \
652 $(lib)/libgnu.a 654 $(lib)/libgnu.a