aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris2010-10-09 10:59:55 -0700
committerGlenn Morris2010-10-09 10:59:55 -0700
commitf4f358f172feadc4c706e540f17e0989c2e1c9b8 (patch)
treeee57599ae141cb4fca7768c329cf3a6bcc9ebcf0 /admin
parent77aec22102cdee599831f5ae3e5eee7e3f2e3a5a (diff)
downloademacs-f4f358f172feadc4c706e540f17e0989c2e1c9b8.tar.gz
emacs-f4f358f172feadc4c706e540f17e0989c2e1c9b8.zip
* configure.in (AC_OUTPUT): Remove doc/emacs/emacsver.texi.
* configure: Regenerate. * .bzrignore: Remove doc/emacs/emacsver.texi. * doc/emacs/Makefile.in (distclean): Do not delete emacsver.texi. * doc/emacs/emacsver.texi: New file, replacing emacsver.texi.in. * admin/admin.el (set-version): Add doc/emacs/emacsver.texi.
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog4
-rw-r--r--admin/admin.el3
2 files changed, 7 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index dc220d99741..b2a416f9467 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,5 +1,9 @@
12010-10-09 Glenn Morris <rgm@gnu.org> 12010-10-09 Glenn Morris <rgm@gnu.org>
2 2
3 * admin.el (set-version): Add doc/emacs/emacsver.texi.
4
52010-10-09 Glenn Morris <rgm@gnu.org>
6
3 * admin.el (set-version): No need to act on doc/ files any more. 7 * admin.el (set-version): No need to act on doc/ files any more.
4 8
5 * quick-install-emacs (PUBLIC_LIBSRC_BINARIES): Remove b2m. 9 * quick-install-emacs (PUBLIC_LIBSRC_BINARIES): Remove b2m.
diff --git a/admin/admin.el b/admin/admin.el
index 02b2ffac91b..7cd2c02fb58 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -70,6 +70,9 @@ Root must be the root of an Emacs source tree."
70 (rx (and "AC_INIT" (1+ (not (in ?,))) 70 (rx (and "AC_INIT" (1+ (not (in ?,)))
71 ?, (0+ space) 71 ?, (0+ space)
72 (submatch (1+ (in "0-9.")))))) 72 (submatch (1+ (in "0-9."))))))
73 (set-version-in-file root "doc/emacs/emacsver.texi" version
74 (rx (and "EMACSVER" (1+ space)
75 (submatch (1+ (in "0-9."))))))
73 (set-version-in-file root "doc/man/emacs.1" version 76 (set-version-in-file root "doc/man/emacs.1" version
74 (rx (and ".TH EMACS" (1+ not-newline) 77 (rx (and ".TH EMACS" (1+ not-newline)
75 "GNU Emacs" (1+ space) 78 "GNU Emacs" (1+ space)