Two patches this time: djgpp.txt is a patch for djgpp, using
"style.css" if "style.css.tmpl" doesn't exist; manual.txt is
the result of a quick proofreading of the manual.in files.
(Both should be applied with -p1.)
--
Jason.
diff -ur global-5.9.3/global/manual.in global-5.9.3.1/global/manual.in
--- global-5.9.3/global/manual.in Mon Dec 06 22:27:06 2010
+++ global-5.9.3.1/global/manual.in Wed Dec 15 16:06:42 2010
@@ -41,7 +41,7 @@
references and other symbols.
@name{Global} can treat a source tree, that is, a directory that
- has sub-directories and source files as a project.
+ has sub-directories and source files, as a project.
In advance of using this command, you must execute @xref{gtags,1}
at the root directory of a project to make tag files.
Then you can execute this command anywhere in the project.
@@ -65,7 +65,7 @@
This option implies the @option{-x} option.
@it...@option{-g}, @option{--grep} @arg{pattern} [...@arg{files}]}
Print all lines which match to the @arg{pattern}.
- If @arg{files} is specified, this command searchs in the files.
+ If @arg{files} is specified, this command searches in the files.
@it...@option{--help}}
Show help.
@it...@option{-i}, @option{--idutils} @arg{pattern}}
@@ -119,7 +119,7 @@
@it...@option{-o}, @option{--only-other}}
Treat only text files other than source code like @file{README}.
This option is valid only with the @option{-g} or @option{-P}
command.
- This option override the @option{-o} option.
+ This option overrides the @option{-o} option.
@it...@option{-o}, @option{--other}}
Treat not only source files but also text files other than
source code
like @file{README}.
@@ -137,7 +137,7 @@
The default is @arg{path}.
The @option{--result=ctags} and @option{--result=ctags-x} are
equivalent to the @option{-t} and @option{-x} respectively.
- The @option{--result} option is given to priority more than the
-t and -x option.
+ The @option{--result} option is given more priority than the -t
and -x options.
@it...@option{-s}, @option{--symbol}}
Print locations of the specified symbol other than definitions.
@it...@option{-t}, @option{--through}}
@@ -151,7 +151,7 @@
Verbose mode.
@it...@option{-v}, @option{--invert-match}}
Invert the sense of matching, to select non-matching lines.
- This option is valid in the @option{-g} and @option{-P} command.
+ This option is valid only with the @option{-g} or @option{-P}
command.
@it...@option{-x}, @option{--cxref}}
Use standard ctags cxref (with the @arg{-x}) format.
@end_itemize
@@ -195,9 +195,9 @@
@it...@file{gtagsroot}}
If environment variable @var{GTAGSROOT} is not set
and file @file{GTAGSROOT} exists in the same directory with
@file{GTAGS}
- then @name{global} set the @var{GTAGSROOT} to the content of
the file.
+ then @name{global} sets @var{GTAGSROOT} to the contents of the
file.
@it...@file{$home/.globalrc}, @file{/etc/gtags.conf},
@file{[sysconfdir]/gtags.conf}}
- Configuration file.
+ Configuration files.
@end_itemize
@ENVIRONMENT
The following environment variables affect the execution of
@name{global}:
diff -ur global-5.9.3/globash/manual.in global-5.9.3.1/globash/manual.in
--- global-5.9.3/globash/manual.in Mon Dec 06 22:27:06 2010
+++ global-5.9.3.1/globash/manual.in Wed Dec 15 16:09:43 2010
@@ -25,7 +25,7 @@
@HEADER GLOBASH,1,May 2010,GNU Project
@NAME globash - a special shell for GLOBAL using GNU bash.
@SYNOPSIS
- @name{blobash}
+ @name{globash}
@DESCRIPTION
@name{Globash} is a special shell for GLOBAL using GNU bash.
You can use a lot of function to ease reading source code
@@ -60,4 +60,4 @@
@AUTHOR
Shigio YAMAGUCHI.
@HISTORY
- The @name{global} command appeared in GLOBAL-4.1(2001).
+ The @name{globash} command appeared in GLOBAL-4.1(2001).
diff -ur global-5.9.3/gozilla/manual.in global-5.9.3.1/gozilla/manual.in
--- global-5.9.3/gozilla/manual.in Mon Dec 06 22:27:06 2010
+++ global-5.9.3.1/gozilla/manual.in Wed Dec 15 16:12:29 2010
@@ -117,5 +117,5 @@
@AUTHORS
Shigio YAMAGUCHI.
@HISTORY
- The @name{gozilla} command appeared in FreeBSD 2.2.2 but did not
+ The @name{gozilla} command appeared in FreeBSD 2.2.2 but was not
installed by default.
diff -ur global-5.9.3/gtags/manual.in global-5.9.3.1/gtags/manual.in
--- global-5.9.3/gtags/manual.in Mon Dec 06 22:27:06 2010
+++ global-5.9.3.1/gtags/manual.in Wed Dec 15 16:21:10 2010
@@ -34,7 +34,7 @@
(@file{GTAGS}, @file{GRTAGS} and @file{GPATH}).
If @file{gtags.files} exists or the @option{-f} option is specified,
- target files are limited by it. Lines starts with ". " are comments.
+ target files are limited by it. Lines starting with ". " are comments.
C, C++, yacc, java, PHP and Assembly source files are supported.
Files whose names end in @file{.c} or @file{.h} are assumed to be
@@ -80,7 +80,7 @@
If @file{$MAKEOBJDIRPREFIX} directory exists, @name{gtags}
creates
@file{$MAKEOBJDIRPREFIX/<current directory>} directory and makes
tag files in it.
- If @arg{dbpath} is specified, this options is ignored.
+ If @arg{dbpath} is specified, this option is ignored.
@it...@option{--single-update} @arg{file}}
Update tag files for single file.
It is considered that @arg{file} was updated, and other files
were not
@@ -116,7 +116,7 @@
@it...@file{gpath}}
Tag file for path of source files.
@it...@file{$home/.globalrc}, @file{/etc/gtags.conf},
@file{[sysconfdir]/gtags.conf}}
- Configuration file.
+ Configuration files.
@it...@file{gtags.files}}
The list of candidates of target files.
@end_itemize
@@ -144,23 +144,23 @@
@begin_itemize
@it...@code{icase_path}(boolean)}
Ignore case distinctions in the path.
- Suffixes check are affected by this capability.
+ Suffixes check is affected by this capability.
@it...@code{langmap}(comma separated list)}
Language mapping. Each comma-separated map consists of
the language name, a colon, and a list of file extensions.
- As a special exception, @name{gtags} collect values from
multiple @code{langmap} variables.
+ As a special exception, @name{gtags} collects values from
multiple @code{langmap} variables.
Default mapping is
'c:.c.h,yacc:.y,asm:.s.S,java:.java,cpp:.c++.cc.cpp.cxx.hxx.hpp.C.H,php:.php.php3.phtml'.
@it...@code{gtags_parser}(comma separated list)}
Specify the mapping of funtion layer plugin parser.
Each part delimited by the comma consists of the language name,
a colon,
the shared object path, an optional colon followed by a
function name.
If the function name is not specified, 'parser' is assumed.
- As a special exception, @name{gtags} collect values from
multiple @code{gtags_parser} variables.
+ As a special exception, @name{gtags} collects values from
multiple @code{gtags_parser} variables.
@it...@code{skip}(comma separated list)}
@name{Gtags} skips files which are listed in this list.
- As a special exception, @name{gtags} collect values from
multiple @code{skip} variables.
- If the value ends with '/', it assumed as a directory and
@name{gtags} skips all files under it.
- If the value start with '/', it assumed relative path from the
root of source directory.
+ As a special exception, @name{gtags} collects values from
multiple @code{skip} variables.
+ If the value ends with '/', it is assumed as a directory and
@name{gtags} skips all files under it.
+ If the value starts with '/', it is assumed a relative path
from the root of source directory.
@end_itemize
@DIAGNOSTICS
@name{Gtags} exits with a non 0 value if an error occurred, 0 otherwise.
diff -ur global-5.9.3/gtags-cscope/manual.in
global-5.9.3.1/gtags-cscope/manual.in
--- global-5.9.3/gtags-cscope/manual.in Mon Dec 06 22:27:06 2010
+++ global-5.9.3.1/gtags-cscope/manual.in Wed Dec 15 16:14:25 2010
@@ -23,7 +23,7 @@
# o texinfo format reference manual.
#
@HEADER GTAGS-CSCOPE,1,May 2006,GNU Project
-...@name gtags-cscope - pseudo cscope which implements the line-oriented
interface
+...@name gtags-cscope - pseudo cscope which implements the line-oriented
interface.
@SYNOPSIS
@name{gtags-cscope} [-Cqv]
@DESCRIPTION
@@ -36,7 +36,7 @@
as cscope.
Command 2 is not available.
- This command is used as a internal command for context search.
+ This command is used as an internal command for context search.
@OPTIONS
The following options are available:
@begin_itemize
diff -ur global-5.9.3/htags/manual.in global-5.9.3.1/htags/manual.in
--- global-5.9.3/htags/manual.in Mon Dec 06 22:27:06 2010
+++ global-5.9.3.1/htags/manual.in Wed Dec 15 16:28:30 2010
@@ -33,7 +33,7 @@
In advance of using this command, you should execute @xref{gtags,1}
in the root directory of a source project.
Then you can execute @name{htags} in the same place.
- @name{Htags} makes a directory named @file{HTML}, and put a hypertext
in it.
+ @name{Htags} makes a directory named @file{HTML}, and puts a hypertext
in it.
You can start browsing at @file{HTML/index.html}.
Since @name{htags} generates a static hypertext as long as the
@option{-D} or @option{-f}
@@ -90,7 +90,7 @@
By default, use just the last component of a path.
@it...@option{-g}, @option{--gtags}}
Execute @xref{gtags,1} before starting job.
- The @option{-v}, @option{-w} and @arg{dbpath} are passed to
@name{gtags}.
+ The @option{-v}, @option{-w} and @arg{dbpath} options are
passed to @name{gtags}.
@it...@option{--gtagsconf} @arg{file}}
Set the @var{GTAGSCONF} environment variable to @arg{file}.
@it...@option{--gtagslabel} @arg{label}}
@@ -113,10 +113,10 @@
Insert custom header derived from @arg{file} after <body> tag.
@it...@option{--item-order} @arg{spec}}
Specify the order of the items in the top page.
- The @arg{spec} is a string consists of item signs in order.
+ The @arg{spec} is a string consisting of item signs in order.
Each sign means as follows:
- @name{c}: caution, @name{s}: search form,
- @name{m}: mains, @name{d}: definition, @name{f}: files,
@name{t}: call tree.
+ @name{c}: caution; @name{s}: search form;
+ @name{m}: mains; @name{d}: definition; @name{f}: files;
@name{t}: call tree.
The default is @arg{csmdf}.
@it...@option{-m}, @option{--main-func} @arg{name}}
Specify startup function name. The default is @arg{main}.
@@ -124,7 +124,7 @@
Print line numbers. By default, doesn't print line numbers.
The default value of @arg{columns} is 4.
@it...@option{--no-map-file}}
- Stop generating file @file{MAP} and @file{FILEMAP}.
+ Stop generating files @file{MAP} and @file{FILEMAP}.
By default, @name{htags} generates them.
@it...@option{-o}, @option{--other}}
Pick up not only source files but also other files in the file
index.
@@ -194,7 +194,7 @@
@it...@file{gpath}}
Tag file for files.
@it...@file{$home/.globalrc}, @file{/etc/gtags.conf},
@file{[sysconfdir]/gtags.conf}}
- Configuration file.
+ Configuration files.
@it...@file{html/index.html}}
Startup file.
@it...@file{html/MAP}}
@@ -208,8 +208,8 @@
Local configuration file for Apache. This file is generated when
the @option{-f}, @option{-D} or @option{-c} option is specified.
@it...@file{html/GTAGSROOT}}
- If this file exists, CGI program @file{global.cgi} set
- environment variable GTAGSROOT to the content of it.
+ If this file exists, CGI program @file{global.cgi} sets
+ environment variable GTAGSROOT to the contents of it.
If you move directory @file{HTML} from the original place,
please make this file.
@end_itemize
--- global-5.9.3/htags/htags.c Mon Dec 06 22:27:06 2010
+++ global-5.9.3.1/htags/htags.c Wed Dec 15 17:37:22 2010
@@ -2162,7 +2162,15 @@
*/
if (enable_xhtml) {
char com[MAXPATHLEN*2+32];
+#ifdef __DJGPP__
+ const char *template = "";
+ snprintf(com, sizeof(com), "%s/gtags/style.css.tmpl", datadir,
distpath);
+ if (test("f", com))
+ template = ".tmpl";
+ snprintf(com, sizeof(com), "cp %s/gtags/style.css%s
%s/style.css", datadir, template, distpath);
+#else
snprintf(com, sizeof(com), "cp %s/gtags/style.css.tmpl
%s/style.css", datadir, distpath);
+#endif
system(com);
}
if (auto_completion || tree_view) {
_______________________________________________
Bug-global mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/bug-global
