[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112592: Use just DOC instead of DOC-
|
From: |
Stefan Monnier |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112592: Use just DOC instead of DOC-nn.mm. |
|
Date: |
Wed, 15 May 2013 16:12:53 -0400 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112592
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2013-05-15 16:12:53 -0400
message:
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".
modified:
.bzrignore
ChangeLog
Makefile.in
admin/ChangeLog
admin/quick-install-emacs
doc/lispref/ChangeLog
doc/lispref/help.texi
doc/lispref/loading.texi
etc/.gitignore
etc/ChangeLog
etc/PROBLEMS
lib-src/ChangeLog
lib-src/makefile.w32-in
lisp/ChangeLog
lisp/loadup.el
msdos/ChangeLog
msdos/sed1x.inp
nt/ChangeLog
nt/README.W32
nt/makefile.w32-in
src/ChangeLog
src/Makefile.in
src/doc.c
src/lread.c
src/makefile.w32-in
=== modified file '.bzrignore'
--- a/.bzrignore 2013-03-30 06:23:47 +0000
+++ b/.bzrignore 2013-05-15 20:12:53 +0000
@@ -23,7 +23,6 @@
conftest*
core
DOC
-DOC-*
emacs-*/
makefile
Makefile
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-05-13 06:23:08 +0000
+++ b/ChangeLog 2013-05-15 20:12:53 +0000
@@ -1,3 +1,8 @@
+2013-05-15 Stefan Monnier <address@hidden>
+
+ * Makefile.in (install-doc): DOC file is not version specific any more.
+ * .bzrignore: Don't ignore DOC-* any more.
+
2013-05-13 Paul Eggert <address@hidden>
* configure.ac (LD_SWITCH_SYSTEM_TEMACS): OpenBSD needs -nopie.
=== modified file 'Makefile.in'
--- a/Makefile.in 2013-04-18 05:03:53 +0000
+++ b/Makefile.in 2013-05-15 20:12:53 +0000
@@ -581,10 +581,6 @@
## 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 @@
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); \
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2013-05-14 02:12:19 +0000
+++ b/admin/ChangeLog 2013-05-15 20:12:53 +0000
@@ -1,3 +1,7 @@
+2013-05-15 Stefan Monnier <address@hidden>
+
+ * quick-install-emacs: Don't prune DOC-* files a any more.
+
2013-05-14 Glenn Morris <address@hidden>
* cus-test.el (cus-test-get-lisp-files): Ignore obsolete/.
=== modified file 'admin/quick-install-emacs'
--- a/admin/quick-install-emacs 2013-01-01 09:11:05 +0000
+++ b/admin/quick-install-emacs 2013-05-15 20:12:53 +0000
@@ -105,8 +105,8 @@
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 @@
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"
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2013-04-23 18:57:44 +0000
+++ b/doc/lispref/ChangeLog 2013-05-15 20:12:53 +0000
@@ -1,3 +1,9 @@
+2013-05-15 Stefan Monnier <address@hidden>
+
+ * loading.texi (Autoload):
+ * help.texi (Documentation Basics, Accessing Documentation)
+ (Accessing Documentation, Accessing Documentation): DOC-* is now DOC.
+
2013-04-23 Glenn Morris <address@hidden>
* internals.texi (Writing Emacs Primitives): Remove obvious example.
@@ -24,8 +30,8 @@
2013-04-06 Chong Yidong <address@hidden>
* 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 <address@hidden>
- * 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 <address@hidden>
- * 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 <address@hidden>
=== modified file 'doc/lispref/help.texi'
--- a/doc/lispref/help.texi 2013-01-01 09:11:05 +0000
+++ b/doc/lispref/help.texi 2013-05-15 20:12:53 +0000
@@ -93,13 +93,12 @@
(@pxref{Defining Variables}), the documentation is stored in the
variable's @code{variable-documentation} property.
address@hidden @address@hidden (documentation) file
address@hidden @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
address@hidden/etc/address@hidden, where @var{version} is the Emacs
-version number (@pxref{Version Info}).
address@hidden/etc/DOC}).
@item
When a function or variable is loaded from a byte-compiled file during
@@ -126,7 +125,7 @@
@code{documentation} command, below).
If the value recorded in the property list refers to a documentation
-string stored in a @address@hidden 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 @@
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
address@hidden"address@hidden"}.
address@hidden"DOC"}.
@end defun
@defvar doc-directory
This variable holds the name of the directory which should contain the
-file @code{"address@hidden"} 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
=== modified file 'doc/lispref/loading.texi'
--- a/doc/lispref/loading.texi 2013-01-02 16:13:04 +0000
+++ b/doc/lispref/loading.texi 2013-05-15 20:12:53 +0000
@@ -483,7 +483,7 @@
@noindent
In this case, @code{"prolog"} is the name of the file to load, 169681
refers to the documentation string in the
address@hidden/etc/address@hidden file (@pxref{Documentation Basics}),
address@hidden/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
=== modified file 'etc/.gitignore'
--- a/etc/.gitignore 2011-01-15 23:16:57 +0000
+++ b/etc/.gitignore 2013-05-15 20:12:53 +0000
@@ -1,3 +1,2 @@
DOC
-DOC-*
icons/
=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog 2013-05-07 21:34:03 +0000
+++ b/etc/ChangeLog 2013-05-15 20:12:53 +0000
@@ -1,3 +1,7 @@
+2013-05-15 Stefan Monnier <address@hidden>
+
+ * .gitignore: Don't ignore DOC-* any more.
+
2013-05-07 Paul Eggert <address@hidden>
Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
=== modified file 'etc/PROBLEMS'
--- a/etc/PROBLEMS 2013-04-10 01:20:51 +0000
+++ b/etc/PROBLEMS 2013-05-15 20:12:53 +0000
@@ -551,7 +551,7 @@
*** 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.
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2013-05-06 03:32:19 +0000
+++ b/lib-src/ChangeLog 2013-05-15 20:12:53 +0000
@@ -1,3 +1,7 @@
+2013-05-15 Stefan Monnier <address@hidden>
+
+ * makefile.w32-in ($(DOC)): Use DOC rather than DOC-X.
+
2013-05-06 Paul Eggert <address@hidden>
* make-docfile.c (search_lisp_doc_at_eol) [DEBUG]: Fix typo,
=== modified file 'lib-src/makefile.w32-in'
--- a/lib-src/makefile.w32-in 2013-03-23 15:30:38 +0000
+++ b/lib-src/makefile.w32-in 2013-05-15 20:12:53 +0000
@@ -292,10 +292,10 @@
"$(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)
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-05-15 18:31:51 +0000
+++ b/lisp/ChangeLog 2013-05-15 20:12:53 +0000
@@ -1,5 +1,7 @@
2013-05-15 Stefan Monnier <address@hidden>
+ * loadup.el: Just use unversioned DOC.
+
* nxml/nxml-mode.el: Treat unclosed <[[, <?, comment, and other
literals as extending to EOB.
(nxml-last-fontify-end): Remove unused variable.
=== modified file 'lisp/loadup.el'
--- a/lisp/loadup.el 2013-01-01 09:11:05 +0000
+++ b/lisp/loadup.el 2013-05-15 20:12:53 +0000
@@ -305,22 +305,10 @@
(message "Finding pointers to doc strings...")
(if (or (equal (nth 3 command-line-args) "dump")
(equal (nth 4 command-line-args) "dump"))
- (let ((name emacs-version))
- (while (string-match "[^-+_.a-zA-Z0-9]+" name)
- (setq name (concat (downcase (substring name 0 (match-beginning 0)))
- "-"
- (substring name (match-end 0)))))
- (if (memq system-type '(ms-dos windows-nt))
- (setq name (expand-file-name
- (if (fboundp 'x-create-frame) "DOC-X" "DOC") "../etc"))
- (setq name (concat (expand-file-name "../etc/DOC-") name))
- (if (file-exists-p name)
- (delete-file name))
- (copy-file (expand-file-name "../etc/DOC") name t))
- (Snarf-documentation (file-name-nondirectory name)))
- (condition-case nil
- (Snarf-documentation "DOC")
- (error nil)))
+ (Snarf-documentation "DOC")
+ (condition-case nil
+ (Snarf-documentation "DOC")
+ (error nil)))
(message "Finding pointers to doc strings...done")
;; Note: You can cause additional libraries to be preloaded
=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog 2013-03-11 16:31:55 +0000
+++ b/msdos/ChangeLog 2013-05-15 20:12:53 +0000
@@ -1,3 +1,7 @@
+2013-05-15 Stefan Monnier <address@hidden>
+
+ * sed1x.inp: Don't rewrite DOC any more.
+
2013-02-08 Paul Eggert <address@hidden>
* sedlibmk.inp: Sync with changes in lib/Makefile.in.
=== modified file 'msdos/sed1x.inp'
--- a/msdos/sed1x.inp 2013-01-01 09:11:05 +0000
+++ b/msdos/sed1x.inp 2013-05-15 20:12:53 +0000
@@ -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}!
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2013-05-08 15:04:20 +0000
+++ b/nt/ChangeLog 2013-05-15 20:12:53 +0000
@@ -1,3 +1,7 @@
+2013-05-15 Stefan Monnier <address@hidden>
+
+ * makefile.w32-in (clean, top-distclean): DOC-X doesn't exist any more.
+
2013-05-08 Juanma Barranquero <address@hidden>
* config.nt: Sync with autogen/config.in.
=== modified file 'nt/README.W32'
--- a/nt/README.W32 2013-04-01 07:28:56 +0000
+++ b/nt/README.W32 2013-05-15 20:12:53 +0000
@@ -29,7 +29,7 @@
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.
=== modified file 'nt/makefile.w32-in'
--- a/nt/makefile.w32-in 2013-03-27 10:09:44 +0000
+++ b/nt/makefile.w32-in 2013-05-15 20:12:53 +0000
@@ -313,7 +313,7 @@
- $(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 @@
- $(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
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-05-15 18:54:49 +0000
+++ b/src/ChangeLog 2013-05-15 20:12:53 +0000
@@ -1,5 +1,9 @@
2013-05-15 Stefan Monnier <address@hidden>
+ * 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.
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2013-05-07 21:34:03 +0000
+++ b/src/Makefile.in 2013-05-15 20:12:53 +0000
@@ -537,7 +537,7 @@
## 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; \
=== modified file 'src/doc.c'
--- a/src/doc.c 2013-05-09 18:30:46 +0000
+++ b/src/doc.c 2013-05-15 20:12:53 +0000
@@ -58,7 +58,7 @@
}
/* 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 @@
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')
=== modified file 'src/lread.c'
--- a/src/lread.c 2013-05-09 18:30:46 +0000
+++ b/src/lread.c 2013-05-15 20:12:53 +0000
@@ -3557,7 +3557,7 @@
{
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;
=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in 2013-05-08 16:21:19 +0000
+++ b/src/makefile.w32-in 2013-05-15 20:12:53 +0000
@@ -41,7 +41,7 @@
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)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112592: Use just DOC instead of DOC-nn.mm.,
Stefan Monnier <=