From bbba8869a2235d5e9a979d6e8822fbf1e0097c41 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 1 May 2012 00:38:15 -0700 Subject: [PATCH] Only print the edition number of the manuals in the TeX version Frankly, I think the edition conveys little to no information. The version number of Emacs is much more relevant. No-one seems to know what the rules are for updating the edition anyway... * doc/emacs/emacs.texi (@copying): Only print EDITION in the TeX version. * doc/lispref/elisp.texi (@copying): * doc/lispref/intro.texi (Introduction): Only print VERSION in the TeX version. --- doc/emacs/ChangeLog | 4 ++++ doc/emacs/emacs.texi | 17 ++++++++++++++++- doc/lispref/ChangeLog | 5 +++++ doc/lispref/elisp.texi | 8 +++++++- doc/lispref/intro.texi | 10 +++++++--- 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index e61bbb860c6..4e0a8a8f428 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2012-05-01 Glenn Morris + + * emacs.texi (@copying): Only print EDITION in the TeX version. + 2012-04-30 Glenn Morris * search.texi (Regexp Search): Just say "Emacs". diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 13f60e8cfdf..9042f84e3b6 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -3,12 +3,27 @@ @setfilename ../../info/emacs @settitle GNU Emacs Manual -@c The edition number appears in several places in this file +@c The edition number appears in more than one place in this file +@c I don't really know what it means... +@c For example, it has said "Sixteenth" since sometime in the Emacs 22 +@c series, all through 23, and into 24. So it is not very useful IMO, +@c and offers nothing that EMACSVER does not. I guess it relates +@c mainly to the published book sold by the FSF. Hence no longer +@c bother including it except iftex. Really, I think it should not be +@c here at all (since anyone can make a pdf version), but should just +@c be something added by the FSF during the publishing process. +@c Also, the lispref uses a float (3.0), whereas this uses an ordinal, +@c so the format is not even consistent. @set EDITION Sixteenth @include emacsver.texi @copying +@iftex This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* +@end iftex +@ifnottex +This is the @cite{GNU Emacs Manual}, +@end ifnottex updated for Emacs version @value{EMACSVER}. Copyright @copyright{} 1985-1987, 1993-2012 Free Software Foundation, Inc. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 79177a3f59d..58508adb899 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2012-05-01 Glenn Morris + + * elisp.texi (@copying): + * intro.texi (Introduction): Only print VERSION in the TeX version. + 2012-04-29 Chong Yidong * text.texi (Change Hooks): Minor fix for after-change-functions. diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 9c5ae73f718..cbec93c4f6c 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -6,6 +6,7 @@ @c Version of the manual and of Emacs. @c Please remember to update these in vol1.texi and vol2.texi as well. +@c (See comments for EDITION in emacs.texi) @set VERSION 3.1 @include emacsver.texi @set DATE July 2012 @@ -40,7 +41,12 @@ @c @syncodeindex tp fn @copying -This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual,@* +@iftex +This is edition @value{VERSION} of the @cite{GNU Emacs Lisp Reference Manual},@* +@end iftex +@ifnottex +This is the @cite{GNU Emacs Lisp Reference Manual} +@end ifnottex corresponding to Emacs version @value{EMACSVER}. Copyright @copyright{} 1990-1996, 1998-2012 Free Software Foundation, Inc. diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi index 9ae5e1fa849..2e678e02158 100644 --- a/doc/lispref/intro.texi +++ b/doc/lispref/intro.texi @@ -1,6 +1,6 @@ @c -*-coding: iso-latin-1-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 1990-1994, 2001-2012 Free Software Foundation, Inc. +@c Copyright (C) 1990-1994, 2001-2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/intro @@ -34,8 +34,12 @@ Lisp that have counterparts in many programming languages, and later chapters describe features that are peculiar to Emacs Lisp or relate specifically to editing. - This is edition @value{VERSION} of the GNU Emacs Lisp Reference -Manual, corresponding to Emacs version @value{EMACSVER}. + This is +@iftex +edition @value{VERSION} of +@end iftex +the @cite{GNU Emacs Lisp Reference Manual}, +corresponding to Emacs version @value{EMACSVER}. @menu * Caveats:: Flaws and a request for help. -- 2.39.5