Mercurial > emacs

diff admin/admin.el @ 110863:f537cb2035e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set the version number in the texinfo manuals using configure. * doc/misc/Makefile.in (emacsdir): New variable. ($(infodir)/efaq): Pass -I $(emacsdir) to makeinfo. * doc/misc/faq.texi (VER): Replace with EMACSVER from emacsver.texi. * doc/lispref/Makefile.in (emacsdir): New variable. (MAKEINFO): Add -I $emacsdir. (dist): Copy emacsver.texi. * doc/lispref/book-spine.texinfo, doc/lispref/elisp.texi: * doc/lispref/vol2.texi, doc/lispref/vol1.texi: Set EMACSVER by including emacsver.texi. * doc/emacs/emacsver.texi.in: New file. * doc/emacs/emacs.texi: Set EMACSVER by including emacsver.texi. * doc/emacs/Makefile.in (distclean): Delete emacsver.texi. (dist): Copy emacsver.texi. * admin/admin.el (set-version): No need to act on doc/ files any more. * configure.in (AC_OUTPUT): Add doc/emacs/emacsver.texi. * make-dist: Include doc/emacs/*.texi.in.
author Glenn Morris <rgm@gnu.org>
date Fri, 08 Oct 2010 18:41:21 -0700
parents 1277fe6717c9
children b71665f4f9ba
line wrap: on
line diff
--- a/admin/admin.el	Fri Oct 08 18:15:15 2010 -0700
+++ b/admin/admin.el	Fri Oct 08 18:41:21 2010 -0700
@@ -1,7 +1,7 @@
 ;;; admin.el --- utilities for Emacs administration
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+;;   2010  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -70,28 +70,10 @@
 		       (rx (and "AC_INIT" (1+ (not (in ?,)))
                                 ?, (0+ space)
                                 (submatch (1+ (in "0-9."))))))
-  (set-version-in-file root "doc/emacs/emacs.texi" version
-		       (rx (and "EMACSVER" (1+ space)
-				(submatch (1+ (in "0-9."))))))
-  (set-version-in-file root "doc/lispref/elisp.texi" version
-		       (rx (and "EMACSVER" (1+ space)
-				(submatch (1+ (in "0-9."))))))
-  (set-version-in-file root "doc/lispref/vol1.texi" version
-		       (rx (and "EMACSVER" (1+ space)
-				(submatch (1+ (in "0-9."))))))
-  (set-version-in-file root "doc/lispref/vol2.texi" version
-		       (rx (and "EMACSVER" (1+ space)
-				(submatch (1+ (in "0-9."))))))
-  (set-version-in-file root "doc/lispref/book-spine.texinfo" version
-		       (rx (and "Emacs Version" (1+ space)
-				(submatch (1+ (in "0-9."))))))
   (set-version-in-file root "doc/man/emacs.1" version
 		       (rx (and ".TH EMACS" (1+ not-newline)
                                 "GNU Emacs" (1+ space)
 				(submatch (1+ (in "0-9."))))))
-  (set-version-in-file root "doc/misc/faq.texi" version
-		       (rx (and "VER" (1+ space)
-				(submatch (1+ (in "0-9."))))))
   (set-version-in-file root "lib-src/makefile.w32-in" version
 		       (rx (and "VERSION" (0+ space) "=" (0+ space)
 				(submatch (1+ (in "0-9."))))))
@@ -218,5 +200,4 @@
 
 (provide 'admin)
 
-;; arch-tag: 4ea83636-2293-408b-884e-ad64f22a3bf5
 ;;; admin.el ends here