diff options
| author | Miles Bader <miles@gnu.org> | 2007-06-11 01:00:07 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-06-11 01:00:07 +0000 |
| commit | 67f3ad67ee317226cb5d1bb139de0cfd883fdc5e (patch) | |
| tree | 58a0e1bea7a1d8728fd32e6127a44434e7eac006 /lib-src | |
| parent | d17cf4eb2024cf54e4a216312184665094ee3df4 (diff) | |
| parent | 2d715b39ea1c89066f469405d065dd1a6631d28e (diff) | |
| download | emacs-67f3ad67ee317226cb5d1bb139de0cfd883fdc5e.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 781-792)
- Update from CVS
- Merge from gnus--rel--5.10
- Merge from emacs--rel--22
* emacs--rel--22 (patch 33-41)
* gnus--rel--5.10 (patch 226-228)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 9 | ||||
| -rw-r--r-- | lib-src/etags.c | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index e14679ad820..597d203ba41 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2007-06-07 Glenn Morris <rgm@gnu.org> + + * etags.c (print_version): Add `emacs_copyright' string, for + easier automatic updating. + 2007-05-18 Francesco Potort,Al(B <pot@gnu.org> * etags.c: Extern definitions of some more pointer functions for @@ -10,6 +15,10 @@ * makefile.w32-in (VERSION): Increase to 22.1.50. +2007-06-02 Chong Yidong <cyd@stupidchicken.com> + + * Version 22.1 released. + 2007-02-26 Francesco Potort,Al(B <pot@gnu.org> * Makefile.in (etags, ctags): Define EMACS_NAME as "GNU Emacs". diff --git a/lib-src/etags.c b/lib-src/etags.c index b85ec8d57a9..f3534e02d7c 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -887,8 +887,11 @@ etags --help --lang=ada."); static void print_version () { + /* Makes it easier to update automatically. */ + char emacs_copyright[] = "Copyright (C) 2007 Free Software Foundation, Inc."; + printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION); - puts ("Copyright (C) 2007 Free Software Foundation, Inc."); + puts (emacs_copyright); puts ("This program is distributed under the terms in ETAGS.README"); exit (EXIT_SUCCESS); |