--- global~.c 2013-07-11 00:11:43 +1000 +++ global.c 2013-07-11 11:43:38 +1000 @@ -155,7 +155,7 @@ {"colour", optional_argument, NULL, 'C'}, {"definition", no_argument, NULL, 'd'}, {"regexp", required_argument, NULL, 'e'}, - {"ext-regexp", no_argument, NULL, 'E'}, + {"extended-regexp", no_argument, NULL, 'E'}, {"file", no_argument, NULL, 'f'}, {"local", no_argument, NULL, 'l'}, {"file-list", required_argument, NULL, 'L'}, @@ -397,6 +397,8 @@ int optchar; int option_index = 0; + if (getenv("GTAGSTHROUGH")) + Tflag++; prepend_args(getenv("GLOBAL_OPTIONS"), &argc, &argv); logging_arguments(argc, argv); while ((optchar = getopt_long(argc, argv, "acCde:EifgGIlL:mnoOpPqrsStTuvVx", long_options, &option_index)) != EOF) { @@ -614,8 +616,9 @@ if (Vflag) Cflag = 0; #if defined(_WIN32) && !defined(__CYGWIN__) - else if (!(getenv("ANSICON") || LoadLibrary("ANSI32.dll"))) - Cflag = 0; + else if (!(getenv("ANSICON") || LoadLibrary("ANSI32.dll")) + && Cflag == 2) + Cflag = 0; #endif if (Cflag == 2 && !isatty(1)) Cflag = 0; --- manual~.in 2013-07-11 00:37:58 +1000 +++ manual.in 2013-07-11 11:48:32 +1000 @@ -106,7 +106,7 @@ editors and IDEs. @address@hidden, @option{--regexp} @arg{pattern}} Use @arg{pattern} as the pattern; useful to protect patterns beginning with @file{-}. - @address@hidden, @option{--ext-regexp}} + @address@hidden, @option{--extended-regexp}} Interpret @arg{pattern} as an extended regular expression. This is provided to override @option{-G} in @var{GLOBAL_OPTIONS}. @address@hidden @arg{chars}} @@ -252,6 +252,9 @@ @address@hidden If this variable is set, @file{$MAKEOBJDIRPREFIX} is used as the prefix of BSD-style objdir. The default is @file{/usr/obj}. + @address@hidden + If this variable is set, the @option{-T} option is specified. + (Deprecated, please use @var{GLOBAL_OPTIONS} instead.) @address@hidden If this variable is set, the @option{--encode-path=" "} option is specified. @address@hidden