Mercurial > hg > xemacs-beta
changeset 3877:fe5bc63ff0e3
[xemacs-hg @ 2007-03-24 12:41:26 by stephent]
Suppress warning, add more version info to etags. <87d52yx0xr.fsf@uwakimon.sk.tsukuba.ac.jp>
| author | stephent |
|---|---|
| date | Sat, 24 Mar 2007 12:41:26 +0000 |
| parents | a827a51c3241 |
| children | 91cb5170601e |
| files | lib-src/ChangeLog lib-src/etags.c |
| diffstat | 2 files changed, 21 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Sat Mar 24 11:46:43 2007 +0000 +++ b/lib-src/ChangeLog Sat Mar 24 12:41:26 2007 +0000 @@ -1,3 +1,10 @@ +2007-03-24 Stephen J. Turnbull <stephen@xemacs.org> + + * etags.c (print_version): More precise version info. Suggested + by Steve Youngs. + (print_help): Use #ifdef; PRINT_UNDOCUMENTED_OPTIONS_HELP may be + undefined. + 2007-03-24 Stephen J. Turnbull <stephen@xemacs.org> * etags.c: Sync to pot_etags_version 17.26.
--- a/lib-src/etags.c Sat Mar 24 11:46:43 2007 +0000 +++ b/lib-src/etags.c Sat Mar 24 12:41:26 2007 +0000 @@ -834,13 +834,23 @@ #ifndef EMACS_NAME # define EMACS_NAME "standalone" #endif -#ifndef VERSION -# define VERSION "version" +#ifdef EMACS_VERSION +# ifdef XEMACS_EXTRA_NAME +# define E_VERSION EMACS_VERSION " " XEMACS_EXTRA_NAME +# else +# define E_VERSION EMACS_VERSION +# endif +#elif defined(VERSION) +# define E_VERSION VERSION +#else +# define E_VERSION "version" #endif + static void print_version () { - printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION); + printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, E_VERSION); + puts (pot_etags_version); puts ("Copyright (C) 2006 Free Software Foundation, Inc. and Ken Arnold"); puts ("This program is distributed under the same terms as Emacs"); @@ -978,7 +988,7 @@ Print on the standard output an index of items intended for\n\ human consumption, similar to the output of vgrind. The index\n\ is sorted, and gives the page number of each item."); -# if PRINT_UNDOCUMENTED_OPTIONS_HELP +# ifdef PRINT_UNDOCUMENTED_OPTIONS_HELP puts ("-w, --no-duplicates\n\ Do not create duplicate tag entries, for compatibility with\n\ traditional ctags.");