From 6e911150d00fa20c60b91d51aafd2cfd81e1c349 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 15 May 2013 16:12:53 -0400 Subject: [PATCH] Use just DOC instead of DOC-nn.mm. * lisp/loadup.el: Just use unversioned DOC. * Makefile.in (install-doc): DOC file is not version specific any more. * .bzrignore: Don't ignore DOC-* any more. * admin/quick-install-emacs: Don't prune DOC-* files a any more. * doc/lispref/loading.texi (Autoload): * doc/lispref/help.texi (Documentation Basics, Accessing Documentation) (Accessing Documentation, Accessing Documentation): DOC-* is now DOC. * etc/.gitignore: Don't ignore DOC-* any more. * lib-src/makefile.w32-in ($(DOC)): Use DOC rather than DOC-X. * msdos/sed1x.inp: Don't rewrite DOC any more. * nt/makefile.w32-in (clean, top-distclean): DOC-X doesn't exist any more. * src/Makefile.in (bootstrap-clean): DOC-* doesn't exist any more. * src/makefile.w32-in (DOC): Use just "DOC". --- ChangeLog | 5 +++++ Makefile.in | 12 +----------- admin/ChangeLog | 4 ++++ admin/quick-install-emacs | 8 ++------ doc/lispref/ChangeLog | 16 +++++++++++----- doc/lispref/help.texi | 11 +++++------ doc/lispref/loading.texi | 2 +- etc/.gitignore | 1 - etc/ChangeLog | 4 ++++ etc/PROBLEMS | 2 +- lib-src/ChangeLog | 4 ++++ lib-src/makefile.w32-in | 4 ++-- lisp/ChangeLog | 2 ++ lisp/loadup.el | 20 ++++---------------- msdos/ChangeLog | 4 ++++ msdos/sed1x.inp | 2 +- nt/ChangeLog | 4 ++++ nt/README.W32 | 2 +- nt/makefile.w32-in | 4 ++-- src/ChangeLog | 4 ++++ src/Makefile.in | 2 +- src/doc.c | 4 ++-- src/lread.c | 2 +- src/makefile.w32-in | 2 +- 24 files changed, 67 insertions(+), 58 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97c307f3817..f8b46164388 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-05-15 Stefan Monnier + + * Makefile.in (install-doc): DOC file is not version specific any more. + * .bzrignore: Don't ignore DOC-* any more. + 2013-05-13 Paul Eggert * configure.ac (LD_SWITCH_SYSTEM_TEMACS): OpenBSD needs -nopie. diff --git a/Makefile.in b/Makefile.in index 019460acf3c..3c1feae5945 100644 --- a/Makefile.in +++ b/Makefile.in @@ -581,10 +581,6 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR ## guaranteed to do the right thing; eg if we are root and tar is ## preserving source permissions. -## We install only the relevant DOC file if possible -## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*. -## (Note "otherwise" is inaccurate since 2009-08-23.) - ## Note that install-arch-indep deletes and recreates the entire ## installed etc/ directory, so we need it to run before this does. install-doc: src install-arch-indep @@ -592,13 +588,7 @@ install-doc: src install-arch-indep umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \ if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${docdir}; /bin/pwd` ]; \ then \ - fullversion=`./src/emacs --version | sed -n '1 s/GNU Emacs *//p'`; \ - if [ -f "./etc/DOC-$${fullversion}" ]; \ - then \ - docfile="DOC-$${fullversion}"; \ - else \ - docfile="DOC"; \ - fi; \ + docfile="DOC"; \ echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \ ${INSTALL_DATA} etc/$${docfile} $(DESTDIR)${docdir}/$${docfile}; \ $(set_installuser); \ diff --git a/admin/ChangeLog b/admin/ChangeLog index 5ae948ad192..01a6a3ae170 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2013-05-15 Stefan Monnier + + * quick-install-emacs: Don't prune DOC-* files a any more. + 2013-05-14 Glenn Morris * cus-test.el (cus-test-get-lisp-files): Ignore obsolete/. diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index e74a2a5af49..98bd61f839d 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs @@ -105,8 +105,8 @@ and build directories reside. Optionally, $me can also remove old versions of automatically generated files that are version-specific (such as the -versioned emacs executables in the \`src' directory, and the DOC-* files -in the \`etc' directory). The latter action is called \`pruning,' and +versioned emacs executables in the \`src' directory). +The latter action is called \`pruning,' and can be enabled using the \`-p' or \`--prune' options. EOF exit 0 @@ -209,10 +209,6 @@ maybe_mkdir "$DST_INFO" PRUNED="" if test x"$PRUNE" != xno; then - for D in `ls -1t $BUILD/etc/DOC-* | sed 1d`; do - echo $REMOVE_CMD $D - PRUNED="$PRUNED $D" - done for D in `ls -1t $BUILD/src/emacs-$VERSION.* | sed 1d`; do echo $REMOVE_CMD $D PRUNED="$PRUNED $D" diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 1a6fd5eca0d..249a2f21ccb 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,9 @@ +2013-05-15 Stefan Monnier + + * loading.texi (Autoload): + * help.texi (Documentation Basics, Accessing Documentation) + (Accessing Documentation, Accessing Documentation): DOC-* is now DOC. + 2013-04-23 Glenn Morris * internals.texi (Writing Emacs Primitives): Remove obvious example. @@ -24,8 +30,8 @@ 2013-04-06 Chong Yidong * display.texi (Faces): Minor clarifications. - (Defining Faces): Clarify default vs custom face specs. Document - face-spec-set. + (Defining Faces): Clarify default vs custom face specs. + Document face-spec-set. * display.texi (Overlay Properties): * text.texi (Special Properties): Use the "anonymous face" @@ -2050,8 +2056,8 @@ 2012-02-04 Chong Yidong - * functions.texi (What Is a Function): Add closures. Mention - "return value" terminology. Add xref for command-execute. + * functions.texi (What Is a Function): Add closures. + Mention "return value" terminology. Add xref for command-execute. Remove unused "keystroke command" terminology. (Lambda Expressions): Give a different example than in the following subsection. Add xref to Anonymous Functions. @@ -11598,7 +11604,7 @@ 2002-05-13 Kim F. Storm - * variables.texi (Intro to Buffer-Local): Updated warning and + * variables.texi (Intro to Buffer-Local): Update warning and example relating to changing buffer inside let. 2002-03-10 Jan Djärv diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index 9fe069b84d0..aa77ba1f36d 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -93,13 +93,12 @@ When you define a variable with a @code{defvar} or related form (@pxref{Defining Variables}), the documentation is stored in the variable's @code{variable-documentation} property. -@cindex @file{DOC-@var{version}} (documentation) file +@cindex @file{DOC} (documentation) file @item To save memory, the documentation for preloaded functions and variables (including primitive functions and autoloaded functions) is not kept in memory, but in the file -@file{emacs/etc/DOC-@var{version}}, where @var{version} is the Emacs -version number (@pxref{Version Info}). +@file{emacs/etc/DOC}). @item When a function or variable is loaded from a byte-compiled file during @@ -126,7 +125,7 @@ customization groups (but for function documentation, use the @code{documentation} command, below). If the value recorded in the property list refers to a documentation -string stored in a @file{DOC-@var{version}} file or a byte-compiled +string stored in a @file{DOC} file or a byte-compiled file, it looks up that string and returns it. If the property value isn't @code{nil}, isn't a string, and doesn't refer to text in a file, then it is evaluated as a Lisp expression to obtain a string. @@ -296,12 +295,12 @@ memory in the function definitions and variable property lists. Emacs reads the file @var{filename} from the @file{emacs/etc} directory. When the dumped Emacs is later executed, the same file will be looked for in the directory @code{doc-directory}. Usually @var{filename} is -@code{"DOC-@var{version}"}. +@code{"DOC"}. @end defun @defvar doc-directory This variable holds the name of the directory which should contain the -file @code{"DOC-@var{version}"} that contains documentation strings for +file @code{"DOC"} that contains documentation strings for built-in and preloaded functions and variables. In most cases, this is the same as @code{data-directory}. They may be diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 51a060bc6c6..5c92307f7d5 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -483,7 +483,7 @@ For example, @noindent In this case, @code{"prolog"} is the name of the file to load, 169681 refers to the documentation string in the -@file{emacs/etc/DOC-@var{version}} file (@pxref{Documentation Basics}), +@file{emacs/etc/DOC} file (@pxref{Documentation Basics}), @code{t} means the function is interactive, and @code{nil} that it is not a macro or a keymap. @end defun diff --git a/etc/.gitignore b/etc/.gitignore index 618d09438f8..8e12acbee0c 100644 --- a/etc/.gitignore +++ b/etc/.gitignore @@ -1,3 +1,2 @@ DOC -DOC-* icons/ diff --git a/etc/ChangeLog b/etc/ChangeLog index 46564aeebcd..f4f17ac29cf 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2013-05-15 Stefan Monnier + + * .gitignore: Don't ignore DOC-* any more. + 2013-05-07 Paul Eggert Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295) diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 0cfc0ad0c14..7556c23daee 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -551,7 +551,7 @@ with CEDET 1.0pre4) or later. *** Self-documentation messages are garbled. -This means that the file `etc/DOC-...' doesn't properly correspond +This means that the file `etc/DOC' doesn't properly correspond with the Emacs executable. Redumping Emacs and then installing the corresponding pair of files should fix the problem. diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index bd7618e0a82..63108cae9a9 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2013-05-15 Stefan Monnier + + * makefile.w32-in ($(DOC)): Use DOC rather than DOC-X. + 2013-05-06 Paul Eggert * make-docfile.c (search_lisp_doc_at_eol) [DEBUG]: Fix typo, diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 5ec559ff985..9656a3badec 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -292,10 +292,10 @@ $(DOC): stamp_BLD $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(l "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1) "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp2) "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(OTHER_PLATFORM_SUPPORT) - $(CP) $(DOC) ../etc/DOC-X + $(CP) $(DOC) ../etc/DOC - mkdir "../src/$(OBJDIR)" - mkdir "../src/$(OBJDIR)/etc" - $(CP) $(DOC) ../src/$(OBJDIR)/etc/DOC-X + $(CP) $(DOC) ../src/$(OBJDIR)/etc/DOC {$(BLD)}.$(O){$(BLD)}.exe: $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $*.$(O) $(LIBS) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4f620dfb00a..b96d830e807 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2013-05-15 Stefan Monnier + * loadup.el: Just use unversioned DOC. + * nxml/nxml-mode.el: Treat unclosed <[[, + + * sed1x.inp: Don't rewrite DOC any more. + 2013-02-08 Paul Eggert * sedlibmk.inp: Sync with changes in lib/Makefile.in. diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp index 9134bc73d28..dacfee6d385 100644 --- a/msdos/sed1x.inp +++ b/msdos/sed1x.inp @@ -17,7 +17,7 @@ # ---------------------------------------------------------------------- s!^ cd \${oldXMenudir}; \${MAKE}.*$! ${MAKE} -C ${oldXMenudir}.! s!^ @true *$! @rem! -s/DOC/DOC-X/g +#s/DOC/DOC-X/g /^OLDXMENU *=/s!=.*!= ${oldXMenudir}libXMenu11.a! /^LIBXMENU *=/s!= *!= ${OLDXMENU}! /^LIBX_OTHER *=/s!= *!= ${LIBXT} ${LIBX_EXTRA}! diff --git a/nt/ChangeLog b/nt/ChangeLog index 2a602be59c9..b66871e319b 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2013-05-15 Stefan Monnier + + * makefile.w32-in (clean, top-distclean): DOC-X doesn't exist any more. + 2013-05-08 Juanma Barranquero * config.nt: Sync with autogen/config.in. diff --git a/nt/README.W32 b/nt/README.W32 index 19c148bbf0b..a2881ce1914 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -29,7 +29,7 @@ See the end of the file for license conditions. Along with this file should be six subdirectories (bin, etc, info, lisp, leim, site-lisp). If you have downloaded the barebin distribution, then it will contain only the bin directory and the - built in documentation in etc/DOC-X, the rest of the subdirectories + built in documentation in etc/DOC, the rest of the subdirectories are in the src distribution, which the barebin distribution is designed to be used with. diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index d3e1c8e2228..4aa1ea91d44 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -313,7 +313,7 @@ clean: clean-other-dirs-$(MAKETYPE) - $(DEL) $(COMPILER_TEMP_FILES) - $(DEL_TREE) $(OBJDIR) - $(DEL) stamp_BLD - - $(DEL) ../etc/DOC ../etc/DOC-X + - $(DEL) ../etc/DOC clean-other-dirs-nmake: cd ..\lib @@ -373,7 +373,7 @@ top-distclean: - $(DEL_TREE) oo - $(DEL_TREE) oo-spd - $(DEL) stamp_BLD - - $(DEL) ../etc/DOC ../etc/DOC-X + - $(DEL) ../etc/DOC - $(DEL) config.log Makefile - $(DEL) ../README.W32 diff --git a/src/ChangeLog b/src/ChangeLog index 7226698934e..c45ec824919 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2013-05-15 Stefan Monnier + * makefile.w32-in (DOC): Use just "DOC". + + * Makefile.in (bootstrap-clean): DOC-* doesn't exist any more. + * process.c: Export default filters and sentinels to Elisp. (Qinternal_default_process_sentinel, Qinternal_default_process_filter): New constants. diff --git a/src/Makefile.in b/src/Makefile.in index ad81a8d6592..80d23b2d58b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -537,7 +537,7 @@ clean: mostlyclean ## It should remove all files generated during a compilation/bootstrap, ## but not things like config.status or TAGS. bootstrap-clean: clean - rm -f epaths.h config.h config.stamp stamp-h1 stamp-oldxmenu ../etc/DOC-* + rm -f epaths.h config.h config.stamp stamp-h1 stamp-oldxmenu if test -f ./.gdbinit; then \ mv ./.gdbinit ./.gdbinit.save; \ if test -f "$(srcdir)/.gdbinit"; then rm -f ./.gdbinit.save; \ diff --git a/src/doc.c b/src/doc.c index 770cb1eb646..e45481944f0 100644 --- a/src/doc.c +++ b/src/doc.c @@ -58,7 +58,7 @@ read_bytecode_char (bool unreadflag) } /* Extract a doc string from a file. FILEPOS says where to get it. - If it is an integer, use that position in the standard DOC-... file. + If it is an integer, use that position in the standard DOC file. If it is (FILE . INTEGER), use FILE as the file name and INTEGER as the position in that file. But if INTEGER is negative, make it positive. @@ -608,7 +608,7 @@ the same file name is found in the `doc-directory'. */) while (*beg && c_isspace (*beg)) ++beg; for (end = beg; *end && ! c_isspace (*end); ++end) - if (*end == '/') beg = end+1; /* skip directory part */ + if (*end == '/') beg = end + 1; /* Skip directory part. */ len = end - beg; if (len > 4 && end[-4] == '.' && end[-3] == 'o') diff --git a/src/lread.c b/src/lread.c index 15821662fc8..3ca644bb45b 100644 --- a/src/lread.c +++ b/src/lread.c @@ -3557,7 +3557,7 @@ read_list (bool flag, Lisp_Object readcharfun) { if (NILP (Vdoc_file_name)) /* We have not yet called Snarf-documentation, so assume - this file is described in the DOC-MM.NN file + this file is described in the DOC file and Snarf-documentation will fill in the right value later. For now, replace the whole list with 0. */ doc_reference = 1; diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 3484d6c70c8..272b053ed12 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -41,7 +41,7 @@ TRES = $(BLD)/emacs.res TLASTLIB = $(BLD)/lastfile.$(A) GNULIB = ../lib/$(BLD)/libgnu.$(A) -DOC = $(OBJDIR)/etc/DOC-X +DOC = $(OBJDIR)/etc/DOC FULL_LINK_FLAGS = $(LINK_FLAGS) $(TEMACS_EXTRA_LINK) -- 2.39.2