From c47a0ec1ccec6552be55a23935d27399e51b2641 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Sat, 11 Jul 2009 15:50:48 +1000 Subject: [PATCH] Normalise the use of "regexp(s)" vs "regex(es)". "regex" won the Google battle. --- common/content/browser.js | 2 +- common/content/buffer.js | 4 ++-- common/content/ui.js | 2 +- vimperator/NEWS | 2 +- vimperator/locale/en-US/autocommands.txt | 2 +- vimperator/locale/en-US/index.txt | 2 +- vimperator/locale/en-US/options.txt | 8 ++++---- vimperator/locale/en-US/pattern.txt | 2 +- vimperator/locale/en-US/repeat.txt | 2 +- xulmus/locale/en-US/autocommands.txt | 2 +- xulmus/locale/en-US/index.txt | 2 +- xulmus/locale/en-US/options.txt | 8 ++++---- xulmus/locale/en-US/pattern.txt | 2 +- xulmus/locale/en-US/repeat.txt | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/common/content/browser.js b/common/content/browser.js index a1ef083d..70202978 100644 --- a/common/content/browser.js +++ b/common/content/browser.js @@ -121,7 +121,7 @@ function Browser() //{{{ } options.add(["urlseparator"], - "Set the separator regexp used to separate multiple URL args", + "Set the separator regex used to separate multiple URL args", "string", ",\\s"); /////////////////////////////////////////////////////////////////////////////}}} diff --git a/common/content/buffer.js b/common/content/buffer.js index 70a41512..3655d2b3 100644 --- a/common/content/buffer.js +++ b/common/content/buffer.js @@ -1137,7 +1137,7 @@ function Buffer() //{{{ */ followDocumentRelationship: function (rel) { - let regexps = options.get(rel + "pattern").values + let regexes = options.get(rel + "pattern").values .map(function (re) RegExp(re, "i")); function followFrame(frame) @@ -1167,7 +1167,7 @@ function Buffer() //{{{ // TODO: this should probably use the default 'hinttags' value. --djk let res = buffer.evaluateXPath(options["hinttags"], frame.document); - for (let [,regex] in Iterator(regexps)) + for (let [,regex] in Iterator(regexes)) { for (let i in util.range(res.snapshotLength, 0, -1)) { diff --git a/common/content/ui.js b/common/content/ui.js index 8a2f5b35..8012499c 100644 --- a/common/content/ui.js +++ b/common/content/ui.js @@ -859,7 +859,7 @@ function CommandLine() //{{{ // At the moment, adding "" breaks tab completion. Adding // "" has no effect. // TODO: Make non-keyword recognition smarter so that there need not - // be two lists of the same characters (one here and a regexp in + // be two lists of the same characters (one here and a regex in // mappings.js) mappings.add(myModes, ["", '"', "'"], "Expand command line abbreviation", diff --git a/vimperator/NEWS b/vimperator/NEWS index 2191ad99..46051a31 100644 --- a/vimperator/NEWS +++ b/vimperator/NEWS @@ -167,7 +167,7 @@ * add :pagestyle command to allow for switching between alternate style sheets * add :b# to select the alternate buffer * add :tabduplicate command - * new 'urlseparator' option for specifying the regexp used to split the arg to + * new 'urlseparator' option for specifying the regex used to split the arg to :open, :tabopen and :winopen * :set editor now accepts quoting/escaping to use an editor with spaces in the path * support for :%foo as a count for commands (not yet widely used) diff --git a/vimperator/locale/en-US/autocommands.txt b/vimperator/locale/en-US/autocommands.txt index c8b97e9f..6eae8e12 100644 --- a/vimperator/locale/en-US/autocommands.txt +++ b/vimperator/locale/en-US/autocommands.txt @@ -40,7 +40,7 @@ Available {events}: {pat} is a regular expression, use .* if you want to match all URLs. -Note: This differs from Vim which uses a glob rather than a regexp for {pat}. +Note: This differs from Vim which uses a glob rather than a regex for {pat}. The following keywords are available where relevant: diff --git a/vimperator/locale/en-US/index.txt b/vimperator/locale/en-US/index.txt index dba6311c..2f4ff593 100644 --- a/vimperator/locale/en-US/index.txt +++ b/vimperator/locale/en-US/index.txt @@ -321,7 +321,7 @@ section:Options[option-index] ||'smartcase'|| Override the 'ignorecase' option if the pattern contains uppercase characters + ||'suggestengines'|| Engine Alias which has a feature of suggest + ||'titlestring'|| Change the title of the window + -||'urlseparator'|| Set the separator regexp used to separate multiple URL args + +||'urlseparator'|| Set the separator regex used to separate multiple URL args + ||'usermode'|| Show current website with a minimal style sheet to make it easily accessible + ||'verbose'|| Define which info messages are displayed + ||'visualbell'|| Use visual bell instead of beeping on errors + diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt index be9ea2ee..07817939 100644 --- a/vimperator/locale/en-US/options.txt +++ b/vimperator/locale/en-US/options.txt @@ -755,8 +755,8 @@ ____ |\'urlseparator'| ||'urlseparator'|| string (default: ",\s") ____ -Set the separator regexp used to separate multiple URL args. Multiple arguments -can be specified for [c]:open[c], and similar commands, using this regexp as +Set the separator regex used to separate multiple URL args. Multiple arguments +can be specified for [c]:open[c], and similar commands, using this regex as the separator. Using whitespace alone is not generally useful since it is often contained in a single argument. E.g. [c]:open linus torvalds[c] should perform a single search for the key words "linus" and "torvalds" @@ -806,7 +806,7 @@ ____ List of file patterns to ignore when completing files. E.g. to ignore object files and Vim swap files [c]:set wildignore=".*\.o,\..*\.s[a-z]\\{2}"[c] -Note: Unlike Vim each pattern is a regexp rather than a glob. +Note: Unlike Vim each pattern is a regex rather than a glob. ____ @@ -852,7 +852,7 @@ ____ ____ (default: [\.,!\?:;/\\"\^\$%&?\(\)\[\]\\{\\}<>#\\*\+\\|=~ _\\-]) -A regexp which defines the word separators which are used for the +A regex which defines the word separators which are used for the 'hintmatching' types "wordstartswith" and "firstletters" to split the words in the text of a link. ____ diff --git a/vimperator/locale/en-US/pattern.txt b/vimperator/locale/en-US/pattern.txt index 0b928944..dcc685f8 100644 --- a/vimperator/locale/en-US/pattern.txt +++ b/vimperator/locale/en-US/pattern.txt @@ -2,7 +2,7 @@ heading:Text{nbsp}search{nbsp}commands[text-search-commands] Vimperator provides a Vim-like interface to Firefox's standard text search functionality. There is no support for using regular expressions in search -commands as Firefox does not provide native regexp support. It is unlikely that +commands as Firefox does not provide native regex support. It is unlikely that this will ever be available. |/| + diff --git a/vimperator/locale/en-US/repeat.txt b/vimperator/locale/en-US/repeat.txt index ab94260a..359172ae 100644 --- a/vimperator/locale/en-US/repeat.txt +++ b/vimperator/locale/en-US/repeat.txt @@ -35,7 +35,7 @@ ____________________________________________________________________________ ||:mac[ros] [a][pat][a]|| + ________________________________________________________________________________ List recorded macros matching the optional regular expression [a][pat][a]. If -no regexp is given, list all macros. +no regex is given, list all macros. ________________________________________________________________________________ diff --git a/xulmus/locale/en-US/autocommands.txt b/xulmus/locale/en-US/autocommands.txt index 875b84d9..112cada4 100644 --- a/xulmus/locale/en-US/autocommands.txt +++ b/xulmus/locale/en-US/autocommands.txt @@ -47,7 +47,7 @@ Available {events}: {pat} is a regular expression, use .* if you want to match all URLs. -Note: This differs from Vim which uses a glob rather than a regexp for {pat}. +Note: This differs from Vim which uses a glob rather than a regex for {pat}. The following keywords are available where relevant: diff --git a/xulmus/locale/en-US/index.txt b/xulmus/locale/en-US/index.txt index 38d2eb13..deb52099 100644 --- a/xulmus/locale/en-US/index.txt +++ b/xulmus/locale/en-US/index.txt @@ -368,7 +368,7 @@ section:Options[option-index] ||'smartcase'|| Override the 'ignorecase' option if the pattern contains uppercase characters + ||'suggestengines'|| Engine Alias which has a feature of suggest + ||'titlestring'|| Change the title of the window + -||'urlseparator'|| Set the separator regexp used to separate multiple URL args + +||'urlseparator'|| Set the separator regex used to separate multiple URL args + ||'usermode'|| Show current website with a minimal style sheet to make it easily accessible + ||'verbose'|| Define which info messages are displayed + ||'visualbell'|| Use visual bell instead of beeping on errors + diff --git a/xulmus/locale/en-US/options.txt b/xulmus/locale/en-US/options.txt index abf737a9..9b64a0ff 100644 --- a/xulmus/locale/en-US/options.txt +++ b/xulmus/locale/en-US/options.txt @@ -762,8 +762,8 @@ ____ |\'urlseparator'| ||'urlseparator'|| string (default: ",\s") ____ -Set the separator regexp used to separate multiple URL args. Multiple arguments -can be specified for [c]:open[c], and similar commands, using this regexp as +Set the separator regex used to separate multiple URL args. Multiple arguments +can be specified for [c]:open[c], and similar commands, using this regex as the separator. Using whitespace alone is not generally useful since it is often contained in a single argument. E.g. [c]:open linus torvalds[c] should perform a single search for the key words "linus" and "torvalds" @@ -813,7 +813,7 @@ ____ List of file patterns to ignore when completing files. E.g. to ignore object files and Vim swap files [c]:set wildignore=".*\.o,\..*\.s[a-z]\\{2}"[c] -Note: Unlike Vim each pattern is a regexp rather than a glob. +Note: Unlike Vim each pattern is a regex rather than a glob. ____ @@ -859,7 +859,7 @@ ____ ____ (default: [\.,!\?:;/\\"\^\$%&?\(\)\[\]\\{\\}<>#\\*\+\\|=~ _\\-]) -A regexp which defines the word separators which are used for the +A regex which defines the word separators which are used for the 'hintmatching' types "wordstartswith" and "firstletters" to split the words in the text of a link. ____ diff --git a/xulmus/locale/en-US/pattern.txt b/xulmus/locale/en-US/pattern.txt index 1e6fc00c..8f7ba4c3 100644 --- a/xulmus/locale/en-US/pattern.txt +++ b/xulmus/locale/en-US/pattern.txt @@ -2,7 +2,7 @@ heading:Text{nbsp}search{nbsp}commands[text-search-commands] Xulmus provides a Vim-like interface to Songbird's standard text search functionality. There is no support for using regular expressions in search -commands as Songbird does not provide native regexp support. It is unlikely that +commands as Songbird does not provide native regex support. It is unlikely that this will ever be available. |/| + diff --git a/xulmus/locale/en-US/repeat.txt b/xulmus/locale/en-US/repeat.txt index b5cd04c1..2479088b 100644 --- a/xulmus/locale/en-US/repeat.txt +++ b/xulmus/locale/en-US/repeat.txt @@ -34,7 +34,7 @@ ____________________________________________________________________________ ||:mac[ros] [a][pat][a]|| + ________________________________________________________________________________ List recorded macros matching the optional regular expression [a][pat][a]. If -no regexp is given, list all macros. +no regex is given, list all macros. ________________________________________________________________________________