CVS update by stephent xemacs/lib-src ...

[xemacs-cvs at xemacs.org]

  User: stephent
  Date: 07/03/24 13:41:28

  Modified:    xemacs/lib-src ChangeLog etags.c
Log:
Suppress warning, add more version info to etags. <87d52yx0xr.fsf at uwakimon.sk.tsukuba.ac.jp>

Revision  Changes    Path
1.217     +7 -0      XEmacs/xemacs/lib-src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- ChangeLog	2007/03/24 11:46:43	1.216
+++ ChangeLog	2007/03/24 12:41:26	1.217
@@ -1,5 +1,12 @@
 2007-03-24  Stephen J. Turnbull  <stephen at 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 at xemacs.org>
+
 	* etags.c: Sync to pot_etags_version 17.26.
 
 2006-11-24  Benson Margulies  <benson at dchbk.us>



1.38      +14 -4     XEmacs/xemacs/lib-src/etags.c

Index: etags.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/etags.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- etags.c	2007/03/24 11:46:43	1.37
+++ etags.c	2007/03/24 12:41:26	1.38
@@ -834,13 +834,23 @@ etags --help --lang=ada.");
 #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 @@ Relative ones are stored relative to the
         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.");