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

[xemacs-cvs at xemacs.org]

  User: stephent
  Date: 07/05/29 16:14:51

  Modified:    xemacs/lib-src ChangeLog etags.c
Log:
Sync etags.c to pot revision 17.33. <87y7j71ze2.fsf at uwakimon.sk.tsukuba.ac.jp>

Revision  Changes    Path
1.220     +6 -0      XEmacs/xemacs/lib-src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -p -r1.219 -r1.220
--- ChangeLog	2007/05/24 20:18:50	1.219
+++ ChangeLog	2007/05/29 14:14:49	1.220
@@ -1,3 +1,9 @@
+2007-05-29  Stephen J. Turnbull  <stephen at xemacs.org>
+
+	* etags.c: Sync to pot_etags_version 17.26.
+	Reverts part of 2007-03-24 patch: no longer displays
+	pot_etags_version in usage message.
+
 2007-05-22  Jerry James  <james at xemacs.org>
 
 	* ellcc.c (do_init_mode): Plug memory leak.



1.40      +22 -6     XEmacs/xemacs/lib-src/etags.c

Index: etags.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/etags.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- etags.c	2007/05/21 03:50:19	1.39
+++ etags.c	2007/05/29 14:14:49	1.40
@@ -80,7 +80,7 @@ University of California, as described a
  * configuration file containing regexp definitions for etags.
  */
 
-char pot_etags_version[] = "@(#) pot revision number is 17.32";
+char pot_etags_version[] = "@(#) pot revision number is 17.33";
 
 #define	TRUE	1
 #define	FALSE	0
@@ -882,7 +882,7 @@ etags --help --lang=ada.");
 # define EMACS_NAME "standalone"
 #endif
 #ifndef VERSION
-# define VERSION "17.32"
+# define VERSION "17.33"
 #endif
 static void
 print_version ()
@@ -894,6 +894,10 @@ print_version ()
   exit (EXIT_SUCCESS);
 }
 
+#ifndef PRINT_UNDOCUMENTED_OPTIONS_HELP
+# define PRINT_UNDOCUMENTED_OPTIONS_HELP FALSE
+#endif
+
 static void
 print_help (argbuffer)
      argument *argbuffer;
@@ -976,6 +980,11 @@ Relative ones are stored relative to the
     puts ("--no-globals\n\
 	Do not create tag entries for global variables in some\n\
 	languages.  This makes the tags file smaller.");
+
+  if (PRINT_UNDOCUMENTED_OPTIONS_HELP)
+    puts ("--no-line-directive\n\
+        Ignore #line preprocessor directives in C and derived languages.");
+
   if (CTAGS)
     puts ("--members\n\
 	Create tag entries for members of structures in some languages.");
@@ -996,13 +1005,17 @@ Relative ones are stored relative to the
 	MODS are optional one-letter modifiers: `i' means to ignore case,\n\
 	`m' means to allow multi-line matches, `s' implies `m' and\n\
 	causes dot to match any character, including newline.");
+
   puts ("-R, --no-regex\n\
         Don't create tags from regexps for the following files.");
+
   puts ("-I, --ignore-indentation\n\
         In C and C++ do not assume that a closing brace in the first\n\
         column is the final brace of a function or structure definition.");
+
   puts ("-o FILE, --output=FILE\n\
         Write the tags to FILE.");
+
   puts ("--parse-stdin=NAME\n\
         Read from standard input and record tags as belonging to file NAME.");
 
@@ -1030,13 +1043,16 @@ 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
-      puts ("-w, --no-duplicates\n\
+
+      if (PRINT_UNDOCUMENTED_OPTIONS_HELP)
+	puts ("-w, --no-duplicates\n\
         Do not create duplicate tag entries, for compatibility with\n\
 	traditional ctags.");
-      puts ("-w, --no-warn\n\
+
+      if (PRINT_UNDOCUMENTED_OPTIONS_HELP)
+	puts ("-w, --no-warn\n\
         Suppress warning messages about duplicate tag entries.");
-# endif /* PRINT_UNDOCUMENTED_OPTIONS_HELP */
+
       puts ("-x, --cxref\n\
         Like --vgrind, but in the style of cxref, rather than vgrind.\n\
         The output uses line numbers instead of page numbers, but\n\