Branch: refs/heads/master
Author: Frank Lanitz <frank(a)frank.uvena.de>
Committer: Frank Lanitz <frank(a)frank.uvena.de>
Date: Wed, 06 Jan 2016 09:56:51 UTC
Commit: 001fd5c52f94f6d748155771c4df7df20e3624c6
https://github.com/geany/geany/commit/001fd5c52f94f6d748155771c4df7df20e362…
Log Message:
-----------
Merge pull request #849 from BenWiederhake/master
Fix a huge amount of type inside overall Geany
Modified Paths:
--------------
HACKING
README.Packagers
doc/Doxyfile.in
doc/geany.txt
doc/plugins.dox
geany.spec.in
scintilla/lexers/LexCaml.cxx
scintilla/lexers/LexCmake.cxx
scintilla/src/SVector.h
src/plugindata.h
src/plugins.c
src/pluginutils.c
tagmanager/ctags/actionscript.c
tagmanager/ctags/c.c
tagmanager/ctags/ctags.c
tagmanager/ctags/entry.c
tagmanager/ctags/entry.h
tagmanager/ctags/haxe.c
tagmanager/ctags/html.c
tagmanager/ctags/js.c
tagmanager/ctags/json.c
tagmanager/ctags/sql.c
tagmanager/src/tm_tag.c
tagmanager/src/tm_workspace.c
tests/ctags/3526726.tex
tests/ctags/bug1111214.v
tests/ctags/bug612019.pas
tests/ctags/bug852368.cpp
tests/ctags/jsFunc_tutorial.js
tests/ctags/lanus.for
tests/ctags/members.f90
tests/ctags/misc_types.f
tests/ctags/moniker.x68.asm
Modified: HACKING
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -51,7 +51,7 @@ See `Rules to contribute`_ for more information.
Patches
-------
-We are happy to receive patches, but the prefered way is to make a pull
+We are happy to receive patches, but the preferred way is to make a pull
request on our Github repository. If you don't want to make a pull request,
you can send your patches on the devel mailing list, but the rules are the same:
see `Rules to contribute`_ for more information.
@@ -64,7 +64,7 @@ current Git (see `Committing`_)::
We also accept patches against other releases, but it's more work for us.
-If you're not using Git, although you're strongly suggested to used it,
+If you're not using Git, although you're strongly suggested to use it,
you can use the diff command::
$ diff -u originalpath modifiedpath > new-feature.patch
Modified: README.Packagers
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -30,7 +30,7 @@ Geany still has a fallback mechanism for syntax highlighting (if
filetypes.common is installed) but several other features for certain
filetypes will fail (mainly build support).
-For 32 bit builds targetting systems which support large filesystems
+For 32 bit builds targeting systems which support large filesystems
(eg XFS) it may be necessary to build with -D_FILE_OFFSET_BITS=64.
Modified: doc/Doxyfile.in
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1682,7 +1682,7 @@ EXTRA_PACKAGES =
# following commands have a special meaning inside the header: $title,
# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string,
-# for the replacement values of the other commands the user is refered to
+# for the replacement values of the other commands the user is referred to
# HTML_HEADER.
# This tag requires that the tag GENERATE_LATEX is set to YES.
Modified: doc/geany.txt
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -3189,7 +3189,7 @@ configure with a nothing in the label but at least one character in the command.
Substitutions in commands and working directories
`````````````````````````````````````````````````
-The first occurence of each of the following character sequences in each of the
+The first occurrence of each of the following character sequences in each of the
command and working directory fields is substituted by the items specified below
before the command is run.
@@ -3596,9 +3596,9 @@ Find Next Ctrl-G Finds next result.
Find Previous Ctrl-Shift-G Finds previous result.
-Find Next Selection Finds next occurence of selected text.
+Find Next Selection Finds next occurrence of selected text.
-Find Previous Selection Finds previous occurence of selected text.
+Find Previous Selection Finds previous occurrence of selected text.
Replace Ctrl-H (C) Opens the Replace dialog.
@@ -4426,7 +4426,7 @@ For example::
[named_styles]
foo=my_red_color;my_blue_color;false;true
-This allows to define a color pallete by name so that to change a color
+This allows to define a color palette by name so that to change a color
scheme-wide only involves changing the hex value in a single location.
[styling] section
Modified: doc/plugins.dox
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -634,7 +634,7 @@ parameters which you may use or not.
- plugin_configure() => GeanyPlugin->funcs->configure
@note @ref GeanyPluginFuncs::init() should return a boolean value: whether or not the plugin loaded
-succesfully. Since legacy plugins couldn't fail in plugin_init() you should return @c TRUE
+successfully. Since legacy plugins couldn't fail in plugin_init() you should return @c TRUE
unconditionally.
@note Again, plugin_configure_single() is not supported anymore.
@@ -797,7 +797,7 @@ storing a per-sub-plugin interpreter context.
GEANY_PLUGIN_REGISTER_FULL() then you must pass NULL as free_func, because that would be invoked
prior to unloading. Insert the corresponding code into GeanyProxyFuncs::unload.
-@section proxy_compat_guideline Guideline for Checking Compatiblity
+@section proxy_compat_guideline Guideline for Checking Compatibility
Determining if a plugin candidate is compatible is not a single test. There are multiple levels and
each should be handled differently in order to give the user a consistent feedback.
@@ -826,7 +826,7 @@ treatment of native plugins by Geany.
3) The sub-plugin is also depending on Geany's API version (whether it is or not depends on the
design of the proxy). In this case do not do anything special but forward the API version the
sub-plugin is written/compiled against to GEANY_PLUGIN_REGISTER(). Here, Geany will perform its own
-compatiblity check, allowing for a consistent user feedback. The result is again that the
+compatibility check, allowing for a consistent user feedback. The result is again that the
sub-plugin is hidden from the Plugin Manager, like in case 2. But Geany will print a debug message
so you can skip that.
@@ -1029,7 +1029,7 @@ static gpointer demoproxy_load(GeanyPlugin *proxy, GeanyPlugin *plugin,
}
@endcode
-demoproxy_unload() simply releases all resources aquired in demoproxy_load(). It does not have to
+demoproxy_unload() simply releases all resources acquired in demoproxy_load(). It does not have to
do anything else in for unloading.
@code{.c}
Modified: geany.spec.in
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -34,7 +34,7 @@ Requires: glib2, gtk2, pango
BuildRequires: glib2-devel, gtk2-devel, pango-devel, gettext, intltool
%description
-Geany is a small and fast integrated development enviroment with basic
+Geany is a small and fast integrated development environment with basic
features and few dependencies to other packages or Desktop Environments.
Some features:
Modified: scintilla/lexers/LexCaml.cxx
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -112,7 +112,7 @@ long Platform::SendScintillaPointer(WindowID w, unsigned int msg, unsigned long
void EXT_LEXER_DECL Fold(unsigned int lexer, Sci_PositionU startPos, Sci_Position length,
int initStyle, char *words[], WindowID window, char *props)
{
- // below useless evaluation(s) to supress "not used" warnings
+ // below useless evaluation(s) to suppress "not used" warnings
lexer;
// build expected data structures and do the Fold
InternalLexOrFold(1, startPos, length, initStyle, words, window, props);
@@ -126,7 +126,7 @@ int EXT_LEXER_DECL GetLexerCount()
void EXT_LEXER_DECL GetLexerName(unsigned int Index, char *name, int buflength)
{
- // below useless evaluation(s) to supress "not used" warnings
+ // below useless evaluation(s) to suppress "not used" warnings
Index;
// return as much of our lexer name as will fit (what's up with Index?)
if (buflength > 0) {
@@ -141,7 +141,7 @@ void EXT_LEXER_DECL GetLexerName(unsigned int Index, char *name, int buflength)
void EXT_LEXER_DECL Lex(unsigned int lexer, Sci_PositionU startPos, Sci_Position length,
int initStyle, char *words[], WindowID window, char *props)
{
- // below useless evaluation(s) to supress "not used" warnings
+ // below useless evaluation(s) to suppress "not used" warnings
lexer;
// build expected data structures and do the Lex
InternalLexOrFold(0, startPos, length, initStyle, words, window, props);
Modified: scintilla/lexers/LexCmake.cxx
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -54,7 +54,7 @@ static bool CmakeNextLineHasElse(Sci_PositionU start, Sci_PositionU end, Accesso
}
}
- if ( nNextLine == -1 ) // We never foudn the next line...
+ if ( nNextLine == -1 ) // We never found the next line...
return false;
for ( Sci_PositionU firstChar = nNextLine; firstChar < end; firstChar++ ) {
Modified: scintilla/src/SVector.h
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -101,7 +101,7 @@ class SVector {
len = 0;
}
/** @brief Grow vector size.
- * Doesn't allow a vector to be shrinked. */
+ * Doesn't allow a vector to be shrunk. */
void SetLength(unsigned int newLength) {
if (newLength > len) {
if (newLength >= size) {
Modified: src/plugindata.h
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -328,7 +328,7 @@ gboolean geany_plugin_register_full(GeanyPlugin *plugin, gint api_version,
gpointer data, GDestroyNotify free_func);
void geany_plugin_set_data(GeanyPlugin *plugin, gpointer data, GDestroyNotify free_func);
-/** Convinience macro to register a plugin.
+/** Convenience macro to register a plugin.
*
* It simply calls geany_plugin_register() with GEANY_API_VERSION and GEANY_ABI_VERSION.
*
@@ -339,7 +339,7 @@ void geany_plugin_set_data(GeanyPlugin *plugin, gpointer data, GDestroyNotify fr
geany_plugin_register((plugin), GEANY_API_VERSION, \
(min_api_version), GEANY_ABI_VERSION)
-/** Convinience macro to register a plugin with data.
+/** Convenience macro to register a plugin with data.
*
* It simply calls geany_plugin_register_full() with GEANY_API_VERSION and GEANY_ABI_VERSION.
*
Modified: src/plugins.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -1013,7 +1013,7 @@ static gboolean check_plugin_path(const gchar *fname)
}
-/* Retuns NULL if this ain't a plugin,
+/* Returns NULL if this ain't a plugin,
* otherwise it returns the appropriate PluginProxy instance to load it */
static PluginProxy* is_plugin(const gchar *file)
{
@@ -2002,7 +2002,7 @@ gboolean geany_plugin_register_proxy(GeanyPlugin *plugin, const gchar **extensio
g_return_val_if_fail(plugin->proxy_funcs->unload != NULL, FALSE);
p = plugin->priv;
- /* Check if this was called aready. We want to reserve for the use case of calling
+ /* Check if this was called already. We want to reserve for the use case of calling
* this again to set new supported extensions (for example, based on proxy configuration). */
foreach_list(node, active_proxies.head)
{
Modified: src/pluginutils.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -573,8 +573,8 @@ void geany_plugin_set_data(GeanyPlugin *plugin, gpointer pdata, GDestroyNotify f
* In the future we want to support proxy plugins (which bind non-C plugins to
* Geany's plugin api). These proxy plugins might need to own the data pointer
* on behalf of the proxied plugin. However, if not, then the plugin should be
- * free to use it. This way we can make sure the plugin doesn't accidently trash
- * its proxy.
+ * free to use it. This way we can make sure the plugin doesn't accidentally
+ * trash its proxy.
*
* Better a more limited API now that can be opened up later than a potentially
* wrong one that can only be replaced by another one. */
Modified: tagmanager/ctags/actionscript.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -85,7 +85,7 @@ static void installActionScriptRegex (const langType language)
"\\1", "p,prototype", NULL);
}
-/* Create parser definition stucture */
+/* Create parser definition structure */
extern parserDefinition* ActionScriptParser (void)
{
Modified: tagmanager/ctags/c.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -855,7 +855,7 @@ static boolean isContextualStatement (const statementInfo *const st)
{
if (isLanguage (Lang_vala))
{
- /* All can be a contextual statment as properties can be of any type */
+ /* All can be a contextual statement as properties can be of any type */
result = TRUE;
}
else
@@ -977,7 +977,7 @@ static void reinitStatementWithToken (statementInfo *const st,
token = activeToken (st);
copyToken (token, save);
deleteToken (save);
- ++st->tokenIndex; /* this is quite save becouse current tokenIndex = 0 */
+ ++st->tokenIndex; /* this is quite safe because current tokenIndex = 0 */
}
static void initStatement (statementInfo *const st, statementInfo *const parent)
Modified: tagmanager/ctags/ctags.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -186,7 +186,7 @@
# define S_IWUSR 0200
#endif
-/* Hack for rediculous practice of Microsoft Visual C++.
+/* Hack for ridiculous practice of Microsoft Visual C++.
*/
#if defined (WIN32)
# if defined (_MSC_VER)
Modified: tagmanager/ctags/entry.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -59,7 +59,7 @@
# define USE_REPLACEMENT_TRUNCATE
#endif
-/* Hack for rediculous practice of Microsoft Visual C++.
+/* Hack for ridiculous practice of Microsoft Visual C++.
*/
#if defined (WIN32) && defined (_MSC_VER)
# define chsize _chsize
Modified: tagmanager/ctags/entry.h
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -58,7 +58,7 @@ typedef struct sTagEntryInfo {
MIOPos filePosition; /* file position of line containing tag */
int bufferPosition; /* buffer position of line containing tag */
const char* language; /* language of source file */
- boolean isFileScope; /* is tag visibile only within source file? */
+ boolean isFileScope; /* is tag visible only within source file? */
boolean isFileEntry; /* is this just an entry for a file name? */
boolean truncateLine; /* truncate tag line at end of tag name? */
const char *sourceFileName; /* name of source file */
Modified: tagmanager/ctags/haxe.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -212,7 +212,7 @@ static void findHxTags (void)
}
-/* Create parser definition stucture */
+/* Create parser definition structure */
extern parserDefinition* HaxeParser (void)
{
static const char *const extensions [] = { "hx", NULL };
Modified: tagmanager/ctags/html.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -55,7 +55,7 @@ static void installHtmlRegex (const langType language)
"\\2", "v,variable,H3 heading", "i");
}
-/* Create parser definition stucture */
+/* Create parser definition structure */
extern parserDefinition* HtmlParser (void)
{
static const char *const extensions [] = { "htm", "html", NULL };
Modified: tagmanager/ctags/js.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -1298,7 +1298,7 @@ static boolean parseStatement (tokenInfo *const token, tokenInfo *const parent,
if ( is_inside_class )
is_class = TRUE;
/*
- * var can preceed an inner function
+ * var can precede an inner function
*/
if ( isKeyword(token, KEYWORD_var) ||
isKeyword(token, KEYWORD_let) ||
@@ -1914,7 +1914,7 @@ static void findJsTags (void)
deleteToken (token);
}
-/* Create parser definition stucture */
+/* Create parser definition structure */
extern parserDefinition* JavaScriptParser (void)
{
static const char *const extensions [] = { "js", NULL };
Modified: tagmanager/ctags/json.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -377,7 +377,7 @@ static void initialize (const langType language)
addKeyword ("null", language, KEYWORD_null);
}
-/* Create parser definition stucture */
+/* Create parser definition structure */
extern parserDefinition* JsonParser (void)
{
static const char *const extensions [] = { "json", NULL };
Modified: tagmanager/ctags/sql.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -673,7 +673,7 @@ static void readToken (tokenInfo *const token)
}
/*
- * reads an indentifier, possibly quoted:
+ * reads an identifier, possibly quoted:
* identifier
* "identifier"
* [identifier]
@@ -1186,7 +1186,7 @@ static void parseDeclareANSI (tokenInfo *const token, const boolean local)
* DECLARE varname2 datatype;
* ...
*
- * This differ from PL/SQL where DECLARE preceeds the BEGIN block
+ * This differ from PL/SQL where DECLARE precedes the BEGIN block
* and the DECLARE keyword is not repeated.
*/
while (isKeyword (token, KEYWORD_declare))
Modified: tagmanager/src/tm_tag.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1291,7 +1291,7 @@ static const char *tm_tag_access_name(TMTag *tag)
/*
Prints information about a tag to the given file pointer.
@param tag The tag whose info is required.
- @param fp The file pointer of teh file to print the info to.
+ @param fp The file pointer of the file to print the info to.
*/
void tm_tag_print(TMTag *tag, FILE *fp)
{
Modified: tagmanager/src/tm_workspace.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -477,7 +477,7 @@ static gchar *create_temp_file(const gchar *tpl)
/* Creates a list of global tags. Ideally, this should be created once during
- installations so that all users can use the same file. Thsi is because a full
+ installations so that all users can use the same file. This is because a full
scale global tag list can occupy several megabytes of disk space.
@param pre_process The pre-processing command. This is executed via system(),
so you can pass stuff like 'gcc -E -dD -P `gnome-config --cflags gnome`'.
Modified: tests/ctags/3526726.tex
16 lines changed, 8 insertions(+), 8 deletions(-)
===================================================================
@@ -553,7 +553,7 @@ \subsection{I want to build a Snort box. Will this $<$Insert list of hardware$>
As for OS selection, use what you like. When we implement Data Acquisition
Plugin's in Snort 2.0 this may become more of a factor, but for now I'm hearing
-about a lot of people seeing alot of success using Snort on Solaris, Linux,
+about a lot of people seeing a lot of success using Snort on Solaris, Linux,
*BSD and Windows 2000. Personally, I develop Snort on FreeBSD and Sourcefire
uses OpenBSD for our sensor appliance OS, but I've been hearing some good
things about the RedHat Turbo Packet interface (which would require mods for
@@ -640,7 +640,7 @@ \subsection{How do I setup snort on a `stealth' interface? }\label{stealth}
\item In a command prompt, run 'ipconfig' to verify the interface does not have an IP bound to it.
\end{enumerate}
-If you do not recieve an IP address listing from the interface you
+If you do not receive an IP address listing from the interface you
modified, you are good to go. To run snort with the specified interface,
use the -i flag such as 'snort -v -d -p -i1'
@@ -1604,7 +1604,7 @@ \subsection{Why does the program generate alerts on packets that have pass rules
The default order that the rules are applied in is alerts first, then pass
rules, then log rules. This ordering ensures that you don't write 50 great
-alert rules and then disable them all accidently with an errant pass rule. If
+alert rules and then disable them all accidentally with an errant pass rule. If
you really want to change this order so that the pass rules are applied first,
use the ``-o'' command line switch, or the ``order'' config directive.
@@ -2403,7 +2403,7 @@ \subsection{My /var/log/snort directory gets very large...}
* []#!/bin/sh
#
- # Logfile rotation script for snort writen by jameso(a)elwood.net.
+ # Logfile rotation script for snort written by jameso(a)elwood.net.
#
# This script is pretty basic. We start out by setting some vars.
# Its job is tho rotate the days logfiles, e-mail you with what
@@ -2464,7 +2464,7 @@ \subsection{My /var/log/snort directory gets very large...}
fi
# Move the log files into todays log dir. This is done with
- # a for loop right now, because I am afriad that if alot is
+ # a for loop right now, because I am afriad that if a lot is
# logged there may be to many items to move with a "mv *"
# type command. There may a better way to do this, but I don't
# know it yet.
@@ -2706,7 +2706,7 @@ \subsection{Why can't snort see one of the 10Mbps or 100Mbps traffic on my autos
The bad thing about hubs that {\em don't} have this ``feature,'' is that
in order to support 10bt devices, they throttle the entire hub speed
down to 10bt if there is one or more 10bt only devices hooked up to it.
-I have seen this behavior (and did the bandwidth tests to proove it) on
+I have seen this behavior (and did the bandwidth tests to prove it) on
old 3com office connect 10/100 hubs (newer ones do the 2 hubs with a switch
thing.) So, the point of what I am saying is, since these old hubs have
no switching capabilities, and they don't know which port the traffic is
@@ -2752,7 +2752,7 @@ \subsection{Why can't snort see one of the 10Mbps or 100Mbps traffic on my autos
traffic from the ports that have the devices your interested in to the
port you have your analysis device plugged into. Without doing so,
you don't see the unicast conversations because the traffic is getting
-"switched" accross the backplane so pc on port 1 talks to server on
+"switched" across the backplane so pc on port 1 talks to server on
port 2 and no other ports get this traffic. If server on port 2
broadcasts or multicasts, the information is flooded out all ports.
(multicast can be controlled on some switches so only those ports that
@@ -2763,7 +2763,7 @@ \subsection{Why can't snort see one of the 10Mbps or 100Mbps traffic on my autos
(Bridges and Routers).
Additional caveat: if you deal with full duplex on a switched port,
-only a tap would save you - users have succesfully used Shomiti's
+only a tap would save you - users have successfully used Shomiti's
ones on 100MB FD ports, and used two Snort instances, capturing
traffic on both directions. Port mirroring didn't work in that case ...
Modified: tests/ctags/bug1111214.v
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
//
// Below is an example of a comment that is mis-parsed by exuberant ctags.
// It uses the multi-line comment format, i.e. /* ... */ except that in
-// this case, the character sequence immediately preceeding the closing
+// this case, the character sequence immediately preceding the closing
// delimiter is an asterisk. (Any even number of asterisks would have the
// same problem.
// The line immediately afterwards is used to demonstrate the problem.
Modified: tests/ctags/bug612019.pas
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -16,7 +16,7 @@
In attached sample there are some lines from tags file
generated for object pascal sources.
There are some problems with this lines.
-Generaly speaking they are parsed incorrectly.
+Generally speaking they are parsed incorrectly.
*)
unit a;
Modified: tests/ctags/bug852368.cpp
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -16,8 +16,8 @@ Summary: c/c++ unabalanced template brackets in signature
Initial Comment:
hi,
-ctags 5.5x generates unbalanced tempalte brackets in
-the method/function signature if a funtion parameter
+ctags 5.5x generates unbalanced template brackets in
+the method/function signature if a function parameter
is a template.
i.e.
Modified: tests/ctags/jsFunc_tutorial.js
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -122,7 +122,7 @@ var multiply=D5("*"); // created "multiply" function
// test the functions
alert("result of add="+add(10,2)); // result is 12
-alert("result of substract="+subtract(10,2)); // result is 8
+alert("result of subtract="+subtract(10,2)); // result is 8
alert("result of multiply="+multiply(10,2)); // result is 20
alert(add);
Modified: tests/ctags/lanus.for
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -8,7 +8,7 @@
*
* I'm trying to set ctags to work with some old FORTRAN 77 programs.
* I'm in Windows 2000, vim 6.1 and exuberant ctags 5.3.1.
-* The programs are for VAX FORTRAN 77 as of 1988. Writen with tabs and 132 columns line length.
+* The programs are for VAX FORTRAN 77 as of 1988. Written with tabs and 132 columns line length.
*
* [...]
*
Modified: tests/ctags/members.f90
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@ module Members
implicit none
type HasMembers
- ! a "derived type" in Fortran is analagous to a "class" in other languages
+ ! a "derived type" in Fortran is analogous to a "class" in other languages
integer, kind :: kind_member
integer, len :: len_member
integer :: member
Modified: tests/ctags/misc_types.f
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -12,7 +12,7 @@ program specs
VIRTUAL M(10,10), Y(100)
VOLATILE V, Z, MAT, /INI/
- EXTERNAL ABS ! varations of external and global
+ EXTERNAL ABS ! variations of external and global
CEXTERNAL ABS1 ! not supported
CGLOBAL ABS2 ! not supported
PEXTERNAL ABS3 ! not supported
Modified: tests/ctags/moniker.x68.asm
14 lines changed, 7 insertions(+), 7 deletions(-)
===================================================================
@@ -23,7 +23,7 @@ START MOVEA.L #PROMPT1,A1 Pointer to start of prompt text
* Get firstname
* =============
- MOVEA.L #F_NAME,A1 Pointer to store teh sentance
+ MOVEA.L #F_NAME,A1 Pointer to store the sentence
MOVE.B #READSTR,D0 Set up readstring function
TRAP #15 Get string from KB
MOVE.W D1,D4 Save length of input string to d4
@@ -38,7 +38,7 @@ START MOVEA.L #PROMPT1,A1 Pointer to start of prompt text
MOVEA.L #F_NAME,A0 Move the first char to A0
JSR CHECK2 Check if uppercase
- CMPI.B #1,D5 See if all the sentance is CAPS
+ CMPI.B #1,D5 See if all the sentence is CAPS
BCS START if it is'nt then re-enter
@@ -46,12 +46,12 @@ START MOVEA.L #PROMPT1,A1 Pointer to start of prompt text
* =======================================
SURNAME MOVEA.L #PROMPT2,A1 Pointer to start of prompt text
MOVE.B #PRTSTR,D0 Set up print string function
- MOVE.W #(F_NAME-PROMPT2),D1 The prompt string lenght
+ MOVE.W #(F_NAME-PROMPT2),D1 The prompt string length
TRAP #15 Print Prompt
* Get surname
* ===========
- MOVEA.L #S_NAME,A1 Pointer to store the sentance
+ MOVEA.L #S_NAME,A1 Pointer to store the sentence
MOVE.B #READSTR,D0 Set up readstring function
TRAP #15 Get string from KB
MOVE.W D1,D4 Save length on input string
@@ -66,7 +66,7 @@ SURNAME MOVEA.L #PROMPT2,A1 Pointer to start of prompt text
MOVEA.L #S_NAME,A0 Move the first char to A0
JSR CHECK2 Check if uppercase
- CMPI.B #1,D5 See if all the sentance is CAPS
+ CMPI.B #1,D5 See if all the sentence is CAPS
BCS SURNAME if it is'nt then re-enter
* Move the first char for fname and prints it (Initial Bit)
@@ -78,7 +78,7 @@ INITIAL MOVEA.L #F_NAME,A1 Move the first char to A1
PRNSURNAME MOVEA.L #S_NAME,A1 Pointer to start of prompt text
MOVE.B #0,D0 Set up print string function
- MOVE.W D3,D1 The prompt string lenght
+ MOVE.W D3,D1 The prompt string length
TRAP #15 Print Prompt
QUIT STOP #$2700 Stop the prorgam
@@ -94,7 +94,7 @@ CHECK2 CMPI.B #'A',(A0) Is Char > A ?
CMP.B #('Z'+1),(A0)+ Check if char is < Z
BCC RETURNFALSE If it is then it must be a cap
SUBI.B #1,D4 Decrease s_name / f_name Length
- BNE CHECK2 jump if the sentance is not = 0
+ BNE CHECK2 jump if the sentence is not = 0
RETURNTRUE MOVE.B #1,D5 Moves a one to D5 to make CAPS ture
RTS Jump back to the main program
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 04 Jan 2016 21:30:32 UTC
Commit: e083c8d1c933aadc7b5c8892810902e99de5f752
https://github.com/geany/geany/commit/e083c8d1c933aadc7b5c8892810902e99de5f…
Log Message:
-----------
reflow: Use plain ASCII space instead of `GDK_space`
`GDK_space` is not guaranteed to have the value of an ASCII space
(although it does in practice), and using a GDK constant does not make
sense inside a text manipulation function.
Modified Paths:
--------------
src/keybindings.c
Modified: src/keybindings.c
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -2216,7 +2216,7 @@ static gint split_line(GeanyEditor *editor, gint column)
gint pos;
/* don't split on a trailing space of a line */
- if (sci_get_char_at(sci, lend - 1) == GDK_space)
+ if (sci_get_char_at(sci, lend - 1) == ' ')
lend--;
/* detect when the line is short enough and no more splitting is needed */
@@ -2227,7 +2227,7 @@ static gint split_line(GeanyEditor *editor, gint column)
found = FALSE;
for (pos = edge - 1; pos > lstart; pos--)
{
- if (sci_get_char_at(sci, pos) == GDK_space)
+ if (sci_get_char_at(sci, pos) == ' ')
{
found = TRUE;
break;
@@ -2237,7 +2237,7 @@ static gint split_line(GeanyEditor *editor, gint column)
{
for (pos = edge; pos < lend; pos++)
{
- if (sci_get_char_at(sci, pos) == GDK_space)
+ if (sci_get_char_at(sci, pos) == ' ')
{
found = TRUE;
break;
@@ -2245,7 +2245,7 @@ static gint split_line(GeanyEditor *editor, gint column)
}
}
/* don't split right before a space */
- while (pos + 1 <= lend && sci_get_char_at(sci, pos + 1) == GDK_space)
+ while (pos + 1 <= lend && sci_get_char_at(sci, pos + 1) == ' ')
pos++;
if (!found || pos >= lend)
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 04 Jan 2016 21:21:19 UTC
Commit: ffde79e8ef1d91dc7de3c793c34373e33e5cc9a1
https://github.com/geany/geany/commit/ffde79e8ef1d91dc7de3c793c34373e33e5cc…
Log Message:
-----------
reflow: Don't split right before a whitespace
Avoid splitting lines right before a whitespace when reflowing (e.g.
in case of several consecutive ones) not to move whitespaces at the
start of the next line, which, while they will be removed later on,
can lead to incorrect reflow width and even fully empty lines.
Prefer leave trailing spaces then, which is less of a problem.
Modified Paths:
--------------
src/keybindings.c
Modified: src/keybindings.c
6 lines changed, 5 insertions(+), 1 deletions(-)
===================================================================
@@ -2244,7 +2244,11 @@ static gint split_line(GeanyEditor *editor, gint column)
}
}
}
- if (!found)
+ /* don't split right before a space */
+ while (pos + 1 <= lend && sci_get_char_at(sci, pos + 1) == GDK_space)
+ pos++;
+
+ if (!found || pos >= lend)
break;
sci_insert_text(sci, pos + 1, editor_get_eol_char(editor));
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Ben Wiederhake <BenWiederhake.GitHub(a)gmx.de>
Committer: Ben Wiederhake <BenWiederhake.GitHub(a)gmx.de>
Date: Sun, 03 Jan 2016 17:44:00 UTC
Commit: 2df9f83bf279ebb90e5faa0466f53e5389b49d43
https://github.com/geany/geany/commit/2df9f83bf279ebb90e5faa0466f53e5389b49…
Log Message:
-----------
Typos overlooked by codespell
Modified Paths:
--------------
tests/ctags/moniker.x68.asm
Modified: tests/ctags/moniker.x68.asm
10 lines changed, 5 insertions(+), 5 deletions(-)
===================================================================
@@ -23,7 +23,7 @@ START MOVEA.L #PROMPT1,A1 Pointer to start of prompt text
* Get firstname
* =============
- MOVEA.L #F_NAME,A1 Pointer to store the sentance
+ MOVEA.L #F_NAME,A1 Pointer to store the sentence
MOVE.B #READSTR,D0 Set up readstring function
TRAP #15 Get string from KB
MOVE.W D1,D4 Save length of input string to d4
@@ -38,7 +38,7 @@ START MOVEA.L #PROMPT1,A1 Pointer to start of prompt text
MOVEA.L #F_NAME,A0 Move the first char to A0
JSR CHECK2 Check if uppercase
- CMPI.B #1,D5 See if all the sentance is CAPS
+ CMPI.B #1,D5 See if all the sentence is CAPS
BCS START if it is'nt then re-enter
@@ -51,7 +51,7 @@ SURNAME MOVEA.L #PROMPT2,A1 Pointer to start of prompt text
* Get surname
* ===========
- MOVEA.L #S_NAME,A1 Pointer to store the sentance
+ MOVEA.L #S_NAME,A1 Pointer to store the sentence
MOVE.B #READSTR,D0 Set up readstring function
TRAP #15 Get string from KB
MOVE.W D1,D4 Save length on input string
@@ -66,7 +66,7 @@ SURNAME MOVEA.L #PROMPT2,A1 Pointer to start of prompt text
MOVEA.L #S_NAME,A0 Move the first char to A0
JSR CHECK2 Check if uppercase
- CMPI.B #1,D5 See if all the sentance is CAPS
+ CMPI.B #1,D5 See if all the sentence is CAPS
BCS SURNAME if it is'nt then re-enter
* Move the first char for fname and prints it (Initial Bit)
@@ -94,7 +94,7 @@ CHECK2 CMPI.B #'A',(A0) Is Char > A ?
CMP.B #('Z'+1),(A0)+ Check if char is < Z
BCC RETURNFALSE If it is then it must be a cap
SUBI.B #1,D4 Decrease s_name / f_name Length
- BNE CHECK2 jump if the sentance is not = 0
+ BNE CHECK2 jump if the sentence is not = 0
RETURNTRUE MOVE.B #1,D5 Moves a one to D5 to make CAPS ture
RTS Jump back to the main program
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Ben Wiederhake <BenWiederhake.GitHub(a)gmx.de>
Committer: Ben Wiederhake <BenWiederhake.GitHub(a)gmx.de>
Date: Sun, 03 Jan 2016 17:33:25 UTC
Commit: 29a6b9c003f56b0f3c428e4d514776c5a2041682
https://github.com/geany/geany/commit/29a6b9c003f56b0f3c428e4d514776c5a2041…
Log Message:
-----------
Fix typos
All of these typos were found by codespell, so credits go the
the authors of this incredibly useful tool.
I manually confirmed and adapted all changes, which includes
reflowing over-long lines or filling up with spaces for alignment.
Some of these typos may need forwarding to their original authors.
codespell reported a lot words where I am unsure; I have not
included those corrections.
Modified Paths:
--------------
HACKING
README.Packagers
doc/Doxyfile.in
doc/geany.txt
doc/plugins.dox
geany.spec.in
scintilla/lexers/LexCaml.cxx
scintilla/lexers/LexCmake.cxx
scintilla/src/SVector.h
src/plugindata.h
src/plugins.c
src/pluginutils.c
tagmanager/ctags/actionscript.c
tagmanager/ctags/c.c
tagmanager/ctags/ctags.c
tagmanager/ctags/entry.c
tagmanager/ctags/entry.h
tagmanager/ctags/haxe.c
tagmanager/ctags/html.c
tagmanager/ctags/js.c
tagmanager/ctags/json.c
tagmanager/ctags/sql.c
tagmanager/src/tm_tag.c
tagmanager/src/tm_workspace.c
tests/ctags/3526726.tex
tests/ctags/bug1111214.v
tests/ctags/bug612019.pas
tests/ctags/bug852368.cpp
tests/ctags/jsFunc_tutorial.js
tests/ctags/lanus.for
tests/ctags/members.f90
tests/ctags/misc_types.f
tests/ctags/moniker.x68.asm
Modified: HACKING
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -51,7 +51,7 @@ See `Rules to contribute`_ for more information.
Patches
-------
-We are happy to receive patches, but the prefered way is to make a pull
+We are happy to receive patches, but the preferred way is to make a pull
request on our Github repository. If you don't want to make a pull request,
you can send your patches on the devel mailing list, but the rules are the same:
see `Rules to contribute`_ for more information.
Modified: README.Packagers
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -30,7 +30,7 @@ Geany still has a fallback mechanism for syntax highlighting (if
filetypes.common is installed) but several other features for certain
filetypes will fail (mainly build support).
-For 32 bit builds targetting systems which support large filesystems
+For 32 bit builds targeting systems which support large filesystems
(eg XFS) it may be necessary to build with -D_FILE_OFFSET_BITS=64.
Modified: doc/Doxyfile.in
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1682,7 +1682,7 @@ EXTRA_PACKAGES =
# following commands have a special meaning inside the header: $title,
# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string,
-# for the replacement values of the other commands the user is refered to
+# for the replacement values of the other commands the user is referred to
# HTML_HEADER.
# This tag requires that the tag GENERATE_LATEX is set to YES.
Modified: doc/geany.txt
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -3189,7 +3189,7 @@ configure with a nothing in the label but at least one character in the command.
Substitutions in commands and working directories
`````````````````````````````````````````````````
-The first occurence of each of the following character sequences in each of the
+The first occurrence of each of the following character sequences in each of the
command and working directory fields is substituted by the items specified below
before the command is run.
@@ -3596,9 +3596,9 @@ Find Next Ctrl-G Finds next result.
Find Previous Ctrl-Shift-G Finds previous result.
-Find Next Selection Finds next occurence of selected text.
+Find Next Selection Finds next occurrence of selected text.
-Find Previous Selection Finds previous occurence of selected text.
+Find Previous Selection Finds previous occurrence of selected text.
Replace Ctrl-H (C) Opens the Replace dialog.
@@ -4426,7 +4426,7 @@ For example::
[named_styles]
foo=my_red_color;my_blue_color;false;true
-This allows to define a color pallete by name so that to change a color
+This allows to define a color palette by name so that to change a color
scheme-wide only involves changing the hex value in a single location.
[styling] section
Modified: doc/plugins.dox
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -634,7 +634,7 @@ parameters which you may use or not.
- plugin_configure() => GeanyPlugin->funcs->configure
@note @ref GeanyPluginFuncs::init() should return a boolean value: whether or not the plugin loaded
-succesfully. Since legacy plugins couldn't fail in plugin_init() you should return @c TRUE
+successfully. Since legacy plugins couldn't fail in plugin_init() you should return @c TRUE
unconditionally.
@note Again, plugin_configure_single() is not supported anymore.
@@ -797,7 +797,7 @@ storing a per-sub-plugin interpreter context.
GEANY_PLUGIN_REGISTER_FULL() then you must pass NULL as free_func, because that would be invoked
prior to unloading. Insert the corresponding code into GeanyProxyFuncs::unload.
-@section proxy_compat_guideline Guideline for Checking Compatiblity
+@section proxy_compat_guideline Guideline for Checking Compatibility
Determining if a plugin candidate is compatible is not a single test. There are multiple levels and
each should be handled differently in order to give the user a consistent feedback.
@@ -826,7 +826,7 @@ treatment of native plugins by Geany.
3) The sub-plugin is also depending on Geany's API version (whether it is or not depends on the
design of the proxy). In this case do not do anything special but forward the API version the
sub-plugin is written/compiled against to GEANY_PLUGIN_REGISTER(). Here, Geany will perform its own
-compatiblity check, allowing for a consistent user feedback. The result is again that the
+compatibility check, allowing for a consistent user feedback. The result is again that the
sub-plugin is hidden from the Plugin Manager, like in case 2. But Geany will print a debug message
so you can skip that.
@@ -1029,7 +1029,7 @@ static gpointer demoproxy_load(GeanyPlugin *proxy, GeanyPlugin *plugin,
}
@endcode
-demoproxy_unload() simply releases all resources aquired in demoproxy_load(). It does not have to
+demoproxy_unload() simply releases all resources acquired in demoproxy_load(). It does not have to
do anything else in for unloading.
@code{.c}
Modified: geany.spec.in
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -34,7 +34,7 @@ Requires: glib2, gtk2, pango
BuildRequires: glib2-devel, gtk2-devel, pango-devel, gettext, intltool
%description
-Geany is a small and fast integrated development enviroment with basic
+Geany is a small and fast integrated development environment with basic
features and few dependencies to other packages or Desktop Environments.
Some features:
Modified: scintilla/lexers/LexCaml.cxx
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -112,7 +112,7 @@ long Platform::SendScintillaPointer(WindowID w, unsigned int msg, unsigned long
void EXT_LEXER_DECL Fold(unsigned int lexer, Sci_PositionU startPos, Sci_Position length,
int initStyle, char *words[], WindowID window, char *props)
{
- // below useless evaluation(s) to supress "not used" warnings
+ // below useless evaluation(s) to suppress "not used" warnings
lexer;
// build expected data structures and do the Fold
InternalLexOrFold(1, startPos, length, initStyle, words, window, props);
@@ -126,7 +126,7 @@ int EXT_LEXER_DECL GetLexerCount()
void EXT_LEXER_DECL GetLexerName(unsigned int Index, char *name, int buflength)
{
- // below useless evaluation(s) to supress "not used" warnings
+ // below useless evaluation(s) to suppress "not used" warnings
Index;
// return as much of our lexer name as will fit (what's up with Index?)
if (buflength > 0) {
@@ -141,7 +141,7 @@ void EXT_LEXER_DECL GetLexerName(unsigned int Index, char *name, int buflength)
void EXT_LEXER_DECL Lex(unsigned int lexer, Sci_PositionU startPos, Sci_Position length,
int initStyle, char *words[], WindowID window, char *props)
{
- // below useless evaluation(s) to supress "not used" warnings
+ // below useless evaluation(s) to suppress "not used" warnings
lexer;
// build expected data structures and do the Lex
InternalLexOrFold(0, startPos, length, initStyle, words, window, props);
Modified: scintilla/lexers/LexCmake.cxx
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -54,7 +54,7 @@ static bool CmakeNextLineHasElse(Sci_PositionU start, Sci_PositionU end, Accesso
}
}
- if ( nNextLine == -1 ) // We never foudn the next line...
+ if ( nNextLine == -1 ) // We never found the next line...
return false;
for ( Sci_PositionU firstChar = nNextLine; firstChar < end; firstChar++ ) {
Modified: scintilla/src/SVector.h
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -101,7 +101,7 @@ class SVector {
len = 0;
}
/** @brief Grow vector size.
- * Doesn't allow a vector to be shrinked. */
+ * Doesn't allow a vector to be shrunk. */
void SetLength(unsigned int newLength) {
if (newLength > len) {
if (newLength >= size) {
Modified: src/plugindata.h
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -328,7 +328,7 @@ gboolean geany_plugin_register_full(GeanyPlugin *plugin, gint api_version,
gpointer data, GDestroyNotify free_func);
void geany_plugin_set_data(GeanyPlugin *plugin, gpointer data, GDestroyNotify free_func);
-/** Convinience macro to register a plugin.
+/** Convenience macro to register a plugin.
*
* It simply calls geany_plugin_register() with GEANY_API_VERSION and GEANY_ABI_VERSION.
*
@@ -339,7 +339,7 @@ void geany_plugin_set_data(GeanyPlugin *plugin, gpointer data, GDestroyNotify fr
geany_plugin_register((plugin), GEANY_API_VERSION, \
(min_api_version), GEANY_ABI_VERSION)
-/** Convinience macro to register a plugin with data.
+/** Convenience macro to register a plugin with data.
*
* It simply calls geany_plugin_register_full() with GEANY_API_VERSION and GEANY_ABI_VERSION.
*
Modified: src/plugins.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -1013,7 +1013,7 @@ static gboolean check_plugin_path(const gchar *fname)
}
-/* Retuns NULL if this ain't a plugin,
+/* Returns NULL if this ain't a plugin,
* otherwise it returns the appropriate PluginProxy instance to load it */
static PluginProxy* is_plugin(const gchar *file)
{
@@ -2002,7 +2002,7 @@ gboolean geany_plugin_register_proxy(GeanyPlugin *plugin, const gchar **extensio
g_return_val_if_fail(plugin->proxy_funcs->unload != NULL, FALSE);
p = plugin->priv;
- /* Check if this was called aready. We want to reserve for the use case of calling
+ /* Check if this was called already. We want to reserve for the use case of calling
* this again to set new supported extensions (for example, based on proxy configuration). */
foreach_list(node, active_proxies.head)
{
Modified: src/pluginutils.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -573,8 +573,8 @@ void geany_plugin_set_data(GeanyPlugin *plugin, gpointer pdata, GDestroyNotify f
* In the future we want to support proxy plugins (which bind non-C plugins to
* Geany's plugin api). These proxy plugins might need to own the data pointer
* on behalf of the proxied plugin. However, if not, then the plugin should be
- * free to use it. This way we can make sure the plugin doesn't accidently trash
- * its proxy.
+ * free to use it. This way we can make sure the plugin doesn't accidentally
+ * trash its proxy.
*
* Better a more limited API now that can be opened up later than a potentially
* wrong one that can only be replaced by another one. */
Modified: tagmanager/ctags/actionscript.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -85,7 +85,7 @@ static void installActionScriptRegex (const langType language)
"\\1", "p,prototype", NULL);
}
-/* Create parser definition stucture */
+/* Create parser definition structure */
extern parserDefinition* ActionScriptParser (void)
{
Modified: tagmanager/ctags/c.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -855,7 +855,7 @@ static boolean isContextualStatement (const statementInfo *const st)
{
if (isLanguage (Lang_vala))
{
- /* All can be a contextual statment as properties can be of any type */
+ /* All can be a contextual statement as properties can be of any type */
result = TRUE;
}
else
@@ -977,7 +977,7 @@ static void reinitStatementWithToken (statementInfo *const st,
token = activeToken (st);
copyToken (token, save);
deleteToken (save);
- ++st->tokenIndex; /* this is quite save becouse current tokenIndex = 0 */
+ ++st->tokenIndex; /* this is quite safe because current tokenIndex = 0 */
}
static void initStatement (statementInfo *const st, statementInfo *const parent)
Modified: tagmanager/ctags/ctags.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -186,7 +186,7 @@
# define S_IWUSR 0200
#endif
-/* Hack for rediculous practice of Microsoft Visual C++.
+/* Hack for ridiculous practice of Microsoft Visual C++.
*/
#if defined (WIN32)
# if defined (_MSC_VER)
Modified: tagmanager/ctags/entry.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -59,7 +59,7 @@
# define USE_REPLACEMENT_TRUNCATE
#endif
-/* Hack for rediculous practice of Microsoft Visual C++.
+/* Hack for ridiculous practice of Microsoft Visual C++.
*/
#if defined (WIN32) && defined (_MSC_VER)
# define chsize _chsize
Modified: tagmanager/ctags/entry.h
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -58,7 +58,7 @@ typedef struct sTagEntryInfo {
MIOPos filePosition; /* file position of line containing tag */
int bufferPosition; /* buffer position of line containing tag */
const char* language; /* language of source file */
- boolean isFileScope; /* is tag visibile only within source file? */
+ boolean isFileScope; /* is tag visible only within source file? */
boolean isFileEntry; /* is this just an entry for a file name? */
boolean truncateLine; /* truncate tag line at end of tag name? */
const char *sourceFileName; /* name of source file */
Modified: tagmanager/ctags/haxe.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -212,7 +212,7 @@ static void findHxTags (void)
}
-/* Create parser definition stucture */
+/* Create parser definition structure */
extern parserDefinition* HaxeParser (void)
{
static const char *const extensions [] = { "hx", NULL };
Modified: tagmanager/ctags/html.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -55,7 +55,7 @@ static void installHtmlRegex (const langType language)
"\\2", "v,variable,H3 heading", "i");
}
-/* Create parser definition stucture */
+/* Create parser definition structure */
extern parserDefinition* HtmlParser (void)
{
static const char *const extensions [] = { "htm", "html", NULL };
Modified: tagmanager/ctags/js.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -1298,7 +1298,7 @@ static boolean parseStatement (tokenInfo *const token, tokenInfo *const parent,
if ( is_inside_class )
is_class = TRUE;
/*
- * var can preceed an inner function
+ * var can precede an inner function
*/
if ( isKeyword(token, KEYWORD_var) ||
isKeyword(token, KEYWORD_let) ||
@@ -1914,7 +1914,7 @@ static void findJsTags (void)
deleteToken (token);
}
-/* Create parser definition stucture */
+/* Create parser definition structure */
extern parserDefinition* JavaScriptParser (void)
{
static const char *const extensions [] = { "js", NULL };
Modified: tagmanager/ctags/json.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -377,7 +377,7 @@ static void initialize (const langType language)
addKeyword ("null", language, KEYWORD_null);
}
-/* Create parser definition stucture */
+/* Create parser definition structure */
extern parserDefinition* JsonParser (void)
{
static const char *const extensions [] = { "json", NULL };
Modified: tagmanager/ctags/sql.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -673,7 +673,7 @@ static void readToken (tokenInfo *const token)
}
/*
- * reads an indentifier, possibly quoted:
+ * reads an identifier, possibly quoted:
* identifier
* "identifier"
* [identifier]
@@ -1186,7 +1186,7 @@ static void parseDeclareANSI (tokenInfo *const token, const boolean local)
* DECLARE varname2 datatype;
* ...
*
- * This differ from PL/SQL where DECLARE preceeds the BEGIN block
+ * This differ from PL/SQL where DECLARE precedes the BEGIN block
* and the DECLARE keyword is not repeated.
*/
while (isKeyword (token, KEYWORD_declare))
Modified: tagmanager/src/tm_tag.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1291,7 +1291,7 @@ static const char *tm_tag_access_name(TMTag *tag)
/*
Prints information about a tag to the given file pointer.
@param tag The tag whose info is required.
- @param fp The file pointer of teh file to print the info to.
+ @param fp The file pointer of the file to print the info to.
*/
void tm_tag_print(TMTag *tag, FILE *fp)
{
Modified: tagmanager/src/tm_workspace.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -477,7 +477,7 @@ static gchar *create_temp_file(const gchar *tpl)
/* Creates a list of global tags. Ideally, this should be created once during
- installations so that all users can use the same file. Thsi is because a full
+ installations so that all users can use the same file. This is because a full
scale global tag list can occupy several megabytes of disk space.
@param pre_process The pre-processing command. This is executed via system(),
so you can pass stuff like 'gcc -E -dD -P `gnome-config --cflags gnome`'.
Modified: tests/ctags/3526726.tex
16 lines changed, 8 insertions(+), 8 deletions(-)
===================================================================
@@ -553,7 +553,7 @@ \subsection{I want to build a Snort box. Will this $<$Insert list of hardware$>
As for OS selection, use what you like. When we implement Data Acquisition
Plugin's in Snort 2.0 this may become more of a factor, but for now I'm hearing
-about a lot of people seeing alot of success using Snort on Solaris, Linux,
+about a lot of people seeing a lot of success using Snort on Solaris, Linux,
*BSD and Windows 2000. Personally, I develop Snort on FreeBSD and Sourcefire
uses OpenBSD for our sensor appliance OS, but I've been hearing some good
things about the RedHat Turbo Packet interface (which would require mods for
@@ -640,7 +640,7 @@ \subsection{How do I setup snort on a `stealth' interface? }\label{stealth}
\item In a command prompt, run 'ipconfig' to verify the interface does not have an IP bound to it.
\end{enumerate}
-If you do not recieve an IP address listing from the interface you
+If you do not receive an IP address listing from the interface you
modified, you are good to go. To run snort with the specified interface,
use the -i flag such as 'snort -v -d -p -i1'
@@ -1604,7 +1604,7 @@ \subsection{Why does the program generate alerts on packets that have pass rules
The default order that the rules are applied in is alerts first, then pass
rules, then log rules. This ordering ensures that you don't write 50 great
-alert rules and then disable them all accidently with an errant pass rule. If
+alert rules and then disable them all accidentally with an errant pass rule. If
you really want to change this order so that the pass rules are applied first,
use the ``-o'' command line switch, or the ``order'' config directive.
@@ -2403,7 +2403,7 @@ \subsection{My /var/log/snort directory gets very large...}
* []#!/bin/sh
#
- # Logfile rotation script for snort writen by jameso(a)elwood.net.
+ # Logfile rotation script for snort written by jameso(a)elwood.net.
#
# This script is pretty basic. We start out by setting some vars.
# Its job is tho rotate the days logfiles, e-mail you with what
@@ -2464,7 +2464,7 @@ \subsection{My /var/log/snort directory gets very large...}
fi
# Move the log files into todays log dir. This is done with
- # a for loop right now, because I am afriad that if alot is
+ # a for loop right now, because I am afriad that if a lot is
# logged there may be to many items to move with a "mv *"
# type command. There may a better way to do this, but I don't
# know it yet.
@@ -2706,7 +2706,7 @@ \subsection{Why can't snort see one of the 10Mbps or 100Mbps traffic on my autos
The bad thing about hubs that {\em don't} have this ``feature,'' is that
in order to support 10bt devices, they throttle the entire hub speed
down to 10bt if there is one or more 10bt only devices hooked up to it.
-I have seen this behavior (and did the bandwidth tests to proove it) on
+I have seen this behavior (and did the bandwidth tests to prove it) on
old 3com office connect 10/100 hubs (newer ones do the 2 hubs with a switch
thing.) So, the point of what I am saying is, since these old hubs have
no switching capabilities, and they don't know which port the traffic is
@@ -2752,7 +2752,7 @@ \subsection{Why can't snort see one of the 10Mbps or 100Mbps traffic on my autos
traffic from the ports that have the devices your interested in to the
port you have your analysis device plugged into. Without doing so,
you don't see the unicast conversations because the traffic is getting
-"switched" accross the backplane so pc on port 1 talks to server on
+"switched" across the backplane so pc on port 1 talks to server on
port 2 and no other ports get this traffic. If server on port 2
broadcasts or multicasts, the information is flooded out all ports.
(multicast can be controlled on some switches so only those ports that
@@ -2763,7 +2763,7 @@ \subsection{Why can't snort see one of the 10Mbps or 100Mbps traffic on my autos
(Bridges and Routers).
Additional caveat: if you deal with full duplex on a switched port,
-only a tap would save you - users have succesfully used Shomiti's
+only a tap would save you - users have successfully used Shomiti's
ones on 100MB FD ports, and used two Snort instances, capturing
traffic on both directions. Port mirroring didn't work in that case ...
Modified: tests/ctags/bug1111214.v
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
//
// Below is an example of a comment that is mis-parsed by exuberant ctags.
// It uses the multi-line comment format, i.e. /* ... */ except that in
-// this case, the character sequence immediately preceeding the closing
+// this case, the character sequence immediately preceding the closing
// delimiter is an asterisk. (Any even number of asterisks would have the
// same problem.
// The line immediately afterwards is used to demonstrate the problem.
Modified: tests/ctags/bug612019.pas
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -16,7 +16,7 @@
In attached sample there are some lines from tags file
generated for object pascal sources.
There are some problems with this lines.
-Generaly speaking they are parsed incorrectly.
+Generally speaking they are parsed incorrectly.
*)
unit a;
Modified: tests/ctags/bug852368.cpp
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -16,8 +16,8 @@ Summary: c/c++ unabalanced template brackets in signature
Initial Comment:
hi,
-ctags 5.5x generates unbalanced tempalte brackets in
-the method/function signature if a funtion parameter
+ctags 5.5x generates unbalanced template brackets in
+the method/function signature if a function parameter
is a template.
i.e.
Modified: tests/ctags/jsFunc_tutorial.js
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -122,7 +122,7 @@ var multiply=D5("*"); // created "multiply" function
// test the functions
alert("result of add="+add(10,2)); // result is 12
-alert("result of substract="+subtract(10,2)); // result is 8
+alert("result of subtract="+subtract(10,2)); // result is 8
alert("result of multiply="+multiply(10,2)); // result is 20
alert(add);
Modified: tests/ctags/lanus.for
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -8,7 +8,7 @@
*
* I'm trying to set ctags to work with some old FORTRAN 77 programs.
* I'm in Windows 2000, vim 6.1 and exuberant ctags 5.3.1.
-* The programs are for VAX FORTRAN 77 as of 1988. Writen with tabs and 132 columns line length.
+* The programs are for VAX FORTRAN 77 as of 1988. Written with tabs and 132 columns line length.
*
* [...]
*
Modified: tests/ctags/members.f90
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@ module Members
implicit none
type HasMembers
- ! a "derived type" in Fortran is analagous to a "class" in other languages
+ ! a "derived type" in Fortran is analogous to a "class" in other languages
integer, kind :: kind_member
integer, len :: len_member
integer :: member
Modified: tests/ctags/misc_types.f
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -12,7 +12,7 @@ program specs
VIRTUAL M(10,10), Y(100)
VOLATILE V, Z, MAT, /INI/
- EXTERNAL ABS ! varations of external and global
+ EXTERNAL ABS ! variations of external and global
CEXTERNAL ABS1 ! not supported
CGLOBAL ABS2 ! not supported
PEXTERNAL ABS3 ! not supported
Modified: tests/ctags/moniker.x68.asm
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -23,7 +23,7 @@ START MOVEA.L #PROMPT1,A1 Pointer to start of prompt text
* Get firstname
* =============
- MOVEA.L #F_NAME,A1 Pointer to store teh sentance
+ MOVEA.L #F_NAME,A1 Pointer to store the sentance
MOVE.B #READSTR,D0 Set up readstring function
TRAP #15 Get string from KB
MOVE.W D1,D4 Save length of input string to d4
@@ -46,7 +46,7 @@ START MOVEA.L #PROMPT1,A1 Pointer to start of prompt text
* =======================================
SURNAME MOVEA.L #PROMPT2,A1 Pointer to start of prompt text
MOVE.B #PRTSTR,D0 Set up print string function
- MOVE.W #(F_NAME-PROMPT2),D1 The prompt string lenght
+ MOVE.W #(F_NAME-PROMPT2),D1 The prompt string length
TRAP #15 Print Prompt
* Get surname
@@ -78,7 +78,7 @@ INITIAL MOVEA.L #F_NAME,A1 Move the first char to A1
PRNSURNAME MOVEA.L #S_NAME,A1 Pointer to start of prompt text
MOVE.B #0,D0 Set up print string function
- MOVE.W D3,D1 The prompt string lenght
+ MOVE.W D3,D1 The prompt string length
TRAP #15 Print Prompt
QUIT STOP #$2700 Stop the prorgam
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Ben Wiederhake <BenWiederhake.GitHub(a)gmx.de>
Committer: Ben Wiederhake <BenWiederhake.GitHub(a)gmx.de>
Date: Sun, 03 Jan 2016 17:01:10 UTC
Commit: 9941c2d044f088242b341c805ce83fe6af7543d0
https://github.com/geany/geany/commit/9941c2d044f088242b341c805ce83fe6af754…
Log Message:
-----------
Fix obvious typo
Modified Paths:
--------------
HACKING
Modified: HACKING
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -64,7 +64,7 @@ current Git (see `Committing`_)::
We also accept patches against other releases, but it's more work for us.
-If you're not using Git, although you're strongly suggested to used it,
+If you're not using Git, although you're strongly suggested to use it,
you can use the diff command::
$ diff -u originalpath modifiedpath > new-feature.patch
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).