Hello community, here is the log from the commit of package ctags checked in at Tue Jan 9 17:43:20 CET 2007. -------- --- ctags/ctags.changes 2006-12-30 10:37:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/ctags/ctags.changes 2007-01-09 13:49:09.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 9 13:48:55 CET 2007 - schwab@suse.de + +- More etags fixes from CVS. + +------------------------------------------------------------------- Old: ---- etags-17.25.diff etags-17.25.tar.gz etags-gnuctags-allow-duplicates.diff New: ---- etags-17.26.diff etags-17.26.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ctags.spec ++++++ --- /var/tmp/diff_new_pack.x11539/_old 2007-01-09 17:43:11.000000000 +0100 +++ /var/tmp/diff_new_pack.x11539/_new 2007-01-09 17:43:11.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package ctags (Version 2006.12.30) +# spec file for package ctags (Version 2007.1.9) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -15,8 +15,8 @@ Group: Development/Tools/Navigators Autoreqprov: on %define exuberant_ver 5.6 -%define emacs_ver 17.25 -Version: 2006.12.30 +%define emacs_ver 17.26 +Version: 2007.1.9 Release: 1 Summary: A Program to Generate Tag Files for Use with vi and Other Editors URL: http://ctags.sourceforge.net/ @@ -26,7 +26,6 @@ Patch0: ctags-%{exuberant_ver}.diff Patch1: ctags-ycp-parser.diff Patch2: etags-%{emacs_ver}.diff -Patch3: etags-gnuctags-allow-duplicates.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -52,7 +51,6 @@ %patch1 cd ../etags-%{emacs_ver} %patch2 -%patch3 %build CC=gcc @@ -90,6 +88,8 @@ %{_docdir}/ctags %changelog -n ctags +* Tue Jan 09 2007 - schwab@suse.de +- More etags fixes from CVS. * Sat Dec 30 2006 - schwab@suse.de - Fix handling of relative names in #line. * Wed Dec 20 2006 - schwab@suse.de ++++++ etags-17.25.diff -> etags-17.26.diff ++++++ ++++++ etags-17.25.tar.gz -> etags-17.26.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etags-17.25/etags.c new/etags-17.26/etags.c --- old/etags-17.25/etags.c 2006-12-30 10:32:41.000000000 +0100 +++ new/etags-17.26/etags.c 2007-01-06 10:42:21.000000000 +0100 @@ -41,7 +41,7 @@ * configuration file containing regexp definitions for etags. */ -char pot_etags_version[] = "@(#) pot revision number is 17.25"; +char pot_etags_version[] = "@(#) pot revision number is 17.26"; #define TRUE 1 #define FALSE 0 @@ -456,9 +456,10 @@ static bool declarations; /* --declarations: tag them and extern in C&Co*/ static bool members; /* create tags for C member variables */ static bool no_line_directive; /* ignore #line directives (undocumented) */ +static bool no_duplicates; /* no duplicate tags for ctags (undocumented) */ static bool update; /* -u: update tags */ static bool vgrind_style; /* -v: create vgrind style index output */ -static bool no_warnings; /* -w: suppress warnings */ +static bool no_warnings; /* -w: suppress warnings (undocumented) */ static bool cxref_style; /* -x: create cxref style output */ static bool cplusplus; /* .[hc] means C++, not C */ static bool ignoreindent; /* -I: ignore indentation in C */ @@ -477,39 +478,40 @@ static struct option longopts[] = { - { "append", no_argument, NULL, 'a' }, - { "packages-only", no_argument, &packages_only, TRUE }, - { "c++", no_argument, NULL, 'C' }, - { "declarations", no_argument, &declarations, TRUE }, - { "no-line-directive", no_argument, &no_line_directive, TRUE }, - { "help", no_argument, NULL, 'h' }, - { "help", no_argument, NULL, 'H' }, - { "ignore-indentation", no_argument, NULL, 'I' }, - { "language", required_argument, NULL, 'l' }, - { "members", no_argument, &members, TRUE }, - { "no-members", no_argument, &members, FALSE }, - { "output", required_argument, NULL, 'o' }, - { "regex", required_argument, NULL, 'r' }, - { "no-regex", no_argument, NULL, 'R' }, - { "ignore-case-regex", required_argument, NULL, 'c' }, + { "append", no_argument, NULL, 'a' }, + { "packages-only", no_argument, &packages_only, TRUE }, + { "c++", no_argument, NULL, 'C' }, + { "declarations", no_argument, &declarations, TRUE }, + { "no-line-directive", no_argument, &no_line_directive, TRUE }, + { "no-duplicates", no_argument, &no_duplicates, TRUE }, + { "help", no_argument, NULL, 'h' }, + { "help", no_argument, NULL, 'H' }, + { "ignore-indentation", no_argument, NULL, 'I' }, + { "language", required_argument, NULL, 'l' }, + { "members", no_argument, &members, TRUE }, + { "no-members", no_argument, &members, FALSE }, + { "output", required_argument, NULL, 'o' }, + { "regex", required_argument, NULL, 'r' }, + { "no-regex", no_argument, NULL, 'R' }, + { "ignore-case-regex", required_argument, NULL, 'c' }, { "parse-stdin", required_argument, NULL, STDIN }, - { "version", no_argument, NULL, 'V' }, + { "version", no_argument, NULL, 'V' }, #if CTAGS /* Ctags options */ - { "backward-search", no_argument, NULL, 'B' }, - { "cxref", no_argument, NULL, 'x' }, - { "defines", no_argument, NULL, 'd' }, - { "globals", no_argument, &globals, TRUE }, - { "typedefs", no_argument, NULL, 't' }, - { "typedefs-and-c++", no_argument, NULL, 'T' }, - { "update", no_argument, NULL, 'u' }, - { "vgrind", no_argument, NULL, 'v' }, - { "no-warn", no_argument, NULL, 'w' }, + { "backward-search", no_argument, NULL, 'B' }, + { "cxref", no_argument, NULL, 'x' }, + { "defines", no_argument, NULL, 'd' }, + { "globals", no_argument, &globals, TRUE }, + { "typedefs", no_argument, NULL, 't' }, + { "typedefs-and-c++", no_argument, NULL, 'T' }, + { "update", no_argument, NULL, 'u' }, + { "vgrind", no_argument, NULL, 'v' }, + { "no-warn", no_argument, NULL, 'w' }, #else /* Etags options */ - { "no-defines", no_argument, NULL, 'D' }, - { "no-globals", no_argument, &globals, FALSE }, - { "include", required_argument, NULL, 'i' }, + { "no-defines", no_argument, NULL, 'D' }, + { "no-globals", no_argument, &globals, FALSE }, + { "include", required_argument, NULL, 'i' }, #endif { NULL } }; @@ -976,9 +978,13 @@ 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\ + Do not create duplicate tag entries, for compatibility with\n\ + traditional ctags."); puts ("-w, --no-warn\n\ - Suppress warning messages about entries defined in multiple\n\ - files."); + 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\ @@ -1454,8 +1460,11 @@ if (CTAGS) if (append_to_tagfile || update) { - char cmd[2*BUFSIZ+10]; - sprintf (cmd, "sort -o %.*s %.*s", BUFSIZ, tagfile, BUFSIZ, tagfile); + char cmd[2*BUFSIZ+20]; + /* Maybe these should be used: + setenv ("LC_COLLATE", "C", 1); + setenv ("LC_ALL", "C", 1); */ + sprintf (cmd, "sort -u -o %.*s %.*s", BUFSIZ, tagfile, BUFSIZ, tagfile); exit (system (cmd)); } return EXIT_SUCCESS; @@ -2168,7 +2177,7 @@ * If this tag name matches an existing one, then * do not add the node, but maybe print a warning. */ - if (!dif) + if (no_duplicates && !dif) { if (np->fdp == cur_node->fdp) { @@ -6885,6 +6894,7 @@ * tab-width: 8 * fill-column: 79 * c-font-lock-extra-types: ("FILE" "bool" "language" "linebuffer" "fdesc" "node" "regexp") + * c-file-style: gnu * End: */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de