APPROVE COMMIT 21.5 RECOMMEND 21.4 Vin, to sync 21.4 you should just copy lib-src/etags.c and etc/ETAGS.README to the appropriate places. The latter is a permissions file that Francesco says is required by other authors' licenses. (Even though it's duplicated in the header of etags.c.) Basically untested; the patch looks OK, and I trust Francesco. This patch updates etags.c to pot revision 17.33, and syncs it 100% with upstream. Only the version information (which by Francesco's design is tied to the XEmacs release) will vary from a standalone build. At Francesco's request, I am reverting the change that Steve Youngs contributed to include the "pot revision" in the version output, but I have already changed the Makefile so that the +CVS-`date` string will appear for beta versions. That should be precise enough. (Vin: the Makefile change is irrelevant to 21.4, as the complete 21.4.x version is already included AFAIK. Only 21.5 CVS has the extra_name stuff.) Index: lib-src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v retrieving revision 1.219 diff -u -r1.219 ChangeLog --- lib-src/ChangeLog 24 May 2007 20:18:50 -0000 1.219 +++ lib-src/ChangeLog 29 May 2007 14:00:33 -0000 ＠＠ -0,0 +1,6 ＠＠ +2007-05-29 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * 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. + Index: lib-src/etags.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/etags.c,v retrieving revision 1.39 diff -u -r1.39 etags.c --- lib-src/etags.c 21 May 2007 03:50:19 -0000 1.39 +++ lib-src/etags.c 29 May 2007 14:00:33 -0000 ＠＠ -80,7 +80,7 ＠＠ * 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 ＠＠ # define EMACS_NAME "standalone" #endif #ifndef VERSION -# define VERSION "17.32" +# define VERSION "17.33" #endif static void print_version () ＠＠ -894,6 +894,10 ＠＠ 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 ＠＠ 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 ＠＠ 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 ＠＠ 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\ _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches