From 7b6f622f0e54d7da3257ea2083673db24fa6b1d5 Mon Sep 17 00:00:00 2001
From: John Foerch <jjfoerch@earthlink.net>
Date: Fri, 27 Jan 2012 22:09:14 -0500
Subject: [PATCH] build_url_regex renamed to build_url_regexp

---
 modules/page-modes/dailymotion.js           |  2 +-
 modules/page-modes/duckduckgo.js            |  2 +-
 modules/page-modes/github.js                |  2 +-
 modules/page-modes/gmail.js                 |  4 ++--
 modules/page-modes/gmane.js                 |  2 +-
 modules/page-modes/google-calendar.js       |  6 +++---
 modules/page-modes/google-gqueues.js        |  6 +++---
 modules/page-modes/google-images.js         |  2 +-
 modules/page-modes/google-maps.js           |  2 +-
 modules/page-modes/google-reader.js         |  8 ++++----
 modules/page-modes/google-search-results.js | 10 +++++-----
 modules/page-modes/google-video.js          |  2 +-
 modules/page-modes/google-voice.js          |  6 +++---
 modules/page-modes/reddit.js                |  2 +-
 modules/page-modes/twitter.js               |  4 ++--
 modules/page-modes/xkcd.js                  |  8 ++++----
 modules/page-modes/youtube.js               |  4 ++--
 modules/utils.js                            | 14 +++++++-------
 18 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/modules/page-modes/dailymotion.js b/modules/page-modes/dailymotion.js
index 75833e0..65e7c7a 100644
--- a/modules/page-modes/dailymotion.js
+++ b/modules/page-modes/dailymotion.js
@@ -37,7 +37,7 @@ function media_scrape_dailymotion(buffer, results) {
 }
 
 define_page_mode("dailymotion-mode",
-    build_url_regex($domain = /(?:[^\/]*\.)?dailymotion/),
+    build_url_regexp($domain = /(?:[^\/]*\.)?dailymotion/),
     function enable (buffer) {
         media_setup_local_object_classes(buffer);
     },
diff --git a/modules/page-modes/duckduckgo.js b/modules/page-modes/duckduckgo.js
index 0a6259d..6017cda 100644
--- a/modules/page-modes/duckduckgo.js
+++ b/modules/page-modes/duckduckgo.js
@@ -82,7 +82,7 @@ var duckduckgo_modality = {
 };
 
 define_page_mode("duckduckgo-mode",
-    build_url_regex($domain = "duckduckgo"),
+    build_url_regexp($domain = "duckduckgo"),
     function enable (buffer) {
         buffer.content_modalities.push(duckduckgo_modality);
     },
diff --git a/modules/page-modes/github.js b/modules/page-modes/github.js
index 846f93c..1cc2859 100644
--- a/modules/page-modes/github.js
+++ b/modules/page-modes/github.js
@@ -87,7 +87,7 @@ var github_modality = {
 };
 
 define_page_mode("github-mode",
-    build_url_regex($domain = "github", $allow_www = true),
+    build_url_regexp($domain = "github", $allow_www = true),
     function enable (buffer) {
         buffer.content_modalities.push(github_modality);
     },
diff --git a/modules/page-modes/gmail.js b/modules/page-modes/gmail.js
index 1e4fc13..396dcc9 100644
--- a/modules/page-modes/gmail.js
+++ b/modules/page-modes/gmail.js
@@ -72,8 +72,8 @@ function gmail_focus_primary_frame (buffer) {
 }
 
 define_page_mode("gmail-mode",
-    build_url_regex($domain = "mail.google",
-                    $path = new RegExp('(?!support)')),
+    build_url_regexp($domain = "mail.google",
+                     $path = new RegExp('(?!support)')),
     function enable (buffer) {
         add_hook.call(buffer, "buffer_dom_content_loaded_hook",
                       gmail_focus_primary_frame);
diff --git a/modules/page-modes/gmane.js b/modules/page-modes/gmane.js
index c60f4ee..9c13ad5 100644
--- a/modules/page-modes/gmane.js
+++ b/modules/page-modes/gmane.js
@@ -69,7 +69,7 @@ var gmane_modality = {
 };
 
 define_page_mode("gmane-mode",
-    build_url_regex($domain = /(news|thread)\.gmane/, $tlds = ["org"]),
+    build_url_regexp($domain = /(news|thread)\.gmane/, $tlds = ["org"]),
     function enable (buffer) {
         buffer.content_modalities.push(gmane_modality);
     },
diff --git a/modules/page-modes/google-calendar.js b/modules/page-modes/google-calendar.js
index 195dcdc..e4dace8 100644
--- a/modules/page-modes/google-calendar.js
+++ b/modules/page-modes/google-calendar.js
@@ -39,9 +39,9 @@ var google_calendar_modality = {
 };
 
 define_page_mode("google-calendar-mode",
-    build_url_regex($domain = "google",
-                    $path   = "calendar/",
-                    $allow_www = true),
+    build_url_regexp($domain = "google",
+                     $path   = "calendar/",
+                     $allow_www = true),
     function enable (buffer) {
         buffer.content_modalities.push(google_calendar_modality);
     },
diff --git a/modules/page-modes/google-gqueues.js b/modules/page-modes/google-gqueues.js
index 486ebc7..04a1c1c 100644
--- a/modules/page-modes/google-gqueues.js
+++ b/modules/page-modes/google-gqueues.js
@@ -47,9 +47,9 @@ var google_gqueues_modality = {
 };
 
 define_page_mode("google-gqueues-mode",
-    build_url_regex($domain = "gqueues",
-                    $allow_www = true,
-                    $path = "main"),
+    build_url_regexp($domain = "gqueues",
+                     $allow_www = true,
+                     $path = "main"),
     function enable (buffer) {
         buffer.content_modalities.push(google_gqueues_modality);
     },
diff --git a/modules/page-modes/google-images.js b/modules/page-modes/google-images.js
index e4a4885..ce3d70b 100644
--- a/modules/page-modes/google-images.js
+++ b/modules/page-modes/google-images.js
@@ -63,7 +63,7 @@ define_browser_object_class("google-images-imgurl", null,
     });
 
 define_page_mode("google-images-mode",
-    build_url_regex($domain = /(.*\.)?google/, $path = "images"),
+    build_url_regexp($domain = /(.*\.)?google/, $path = "images"),
     function enable (buffer) {
         for each (var c in google_images_imgrefurl_commands) {
             buffer.default_browser_object_classes[c] =
diff --git a/modules/page-modes/google-maps.js b/modules/page-modes/google-maps.js
index 1ee91d0..b68c5de 100644
--- a/modules/page-modes/google-maps.js
+++ b/modules/page-modes/google-maps.js
@@ -77,7 +77,7 @@ var google_maps_modality = {
 };
 
 define_page_mode("google-maps-mode",
-    build_url_regex($domain = "maps.google"),
+    build_url_regexp($domain = "maps.google"),
     function enable (buffer) {
         buffer.content_modalities.push(google_maps_modality);
     },
diff --git a/modules/page-modes/google-reader.js b/modules/page-modes/google-reader.js
index 2046785..96bedd5 100644
--- a/modules/page-modes/google-reader.js
+++ b/modules/page-modes/google-reader.js
@@ -57,10 +57,10 @@ var google_reader_modality = {
 };
 
 define_page_mode("google-reader-mode",
-    build_url_regex($domain = "google",
-                    $tlds = ["com", "co.uk"],
-                    $allow_www = true,
-                    $path = "reader/"),
+    build_url_regexp($domain = "google",
+                     $tlds = ["com", "co.uk"],
+                     $allow_www = true,
+                     $path = "reader/"),
     function enable (buffer) {
         buffer.content_modalities.push(google_reader_modality);
     },
diff --git a/modules/page-modes/google-search-results.js b/modules/page-modes/google-search-results.js
index 1b939ab..6951628 100644
--- a/modules/page-modes/google-search-results.js
+++ b/modules/page-modes/google-search-results.js
@@ -60,11 +60,11 @@ var google_search_results_modality = {
 
 
 define_page_mode("google-search-results-mode",
-    build_url_regex($domain = "google",
-                    $allow_www = true,
-                    $path = /search\?|cse\?/,
-                    $tlds = ["com", "com.au", "co.uk", "de", "dk", "es",
-                             "fr", "it", "no", "se", "uk"]),
+    build_url_regexp($domain = "google",
+                     $allow_www = true,
+                     $path = /search\?|cse\?/,
+                     $tlds = ["com", "com.au", "co.uk", "de", "dk", "es",
+                              "fr", "it", "no", "se", "uk"]),
     function enable (buffer) {
 	var link_using_commands = ["follow",
 				   "follow-new-buffer",
diff --git a/modules/page-modes/google-video.js b/modules/page-modes/google-video.js
index d8191c0..e6b9c65 100644
--- a/modules/page-modes/google-video.js
+++ b/modules/page-modes/google-video.js
@@ -48,7 +48,7 @@ function media_scrape_google_video(buffer, results) {
 
 
 define_page_mode("google-video-mode",
-    build_url_regex($domain = "video.google"),
+    build_url_regexp($domain = "video.google"),
     function enable (buffer) {
         buffer.page.local.media_scraper = [media_scrape_google_video];
         media_setup_local_object_classes(buffer);
diff --git a/modules/page-modes/google-voice.js b/modules/page-modes/google-voice.js
index c543247..a668863 100644
--- a/modules/page-modes/google-voice.js
+++ b/modules/page-modes/google-voice.js
@@ -48,9 +48,9 @@ var google_voice_modality = {
 
 
 define_page_mode("google-voice-mode",
-    build_url_regex($domain = "google",
-                    $allow_www = true,
-                    $path = "voice"),
+    build_url_regexp($domain = "google",
+                     $allow_www = true,
+                     $path = "voice"),
     function enable (buffer) {
         buffer.content_modalities.push(google_voice_modality);
     },
diff --git a/modules/page-modes/reddit.js b/modules/page-modes/reddit.js
index dfece39..53faa42 100644
--- a/modules/page-modes/reddit.js
+++ b/modules/page-modes/reddit.js
@@ -262,7 +262,7 @@ var reddit_modality = {
 
 
 define_page_mode("reddit-mode",
-    build_url_regex($domain = /([a-zA-Z0-9\-]*\.)*reddit/),
+    build_url_regexp($domain = /([a-zA-Z0-9\-]*\.)*reddit/),
     function enable (buffer) {
         let (cmds = ["follow-current",
                      "follow-current-new-buffer",
diff --git a/modules/page-modes/twitter.js b/modules/page-modes/twitter.js
index cc823a6..1f0a468 100644
--- a/modules/page-modes/twitter.js
+++ b/modules/page-modes/twitter.js
@@ -45,8 +45,8 @@ var twitter_modality = {
 };
 
 define_page_mode("twitter-mode",
-    build_url_regex($domain = "twitter",
-                    $allow_www = true),
+    build_url_regexp($domain = "twitter",
+                     $allow_www = true),
     function enable (buffer) {
         buffer.content_modalities.push(twitter_modality);
     },
diff --git a/modules/page-modes/xkcd.js b/modules/page-modes/xkcd.js
index eb44841..f02701a 100644
--- a/modules/page-modes/xkcd.js
+++ b/modules/page-modes/xkcd.js
@@ -44,10 +44,10 @@ function xkcd_do_add_title (buffer) {
 }
 
 define_page_mode("xkcd-mode",
-    build_url_regex($domain = "xkcd",
-                    $allow_www = true,
-                    $tlds = ["com", "net", "org"],
-                    $path = /(\d+\/)?/),
+    build_url_regexp($domain = "xkcd",
+                     $allow_www = true,
+                     $tlds = ["com", "net", "org"],
+                     $path = /(\d+\/)?/),
     function enable (buffer) {
         if (xkcd_add_title) {
             if (buffer.browser.webProgress.isLoadingDocument)
diff --git a/modules/page-modes/youtube.js b/modules/page-modes/youtube.js
index bfbf60e..8a42761 100644
--- a/modules/page-modes/youtube.js
+++ b/modules/page-modes/youtube.js
@@ -131,8 +131,8 @@ function youtube_scrape_embedded (buffer, results) {
 }
 
 define_page_mode("youtube-mode",
-    build_url_regex($domain = /(?:[a-z]+\.)?youtube/,
-                    $path = /watch\?(?:.*?&)?v=([A-Za-z0-9\-_]+)/),
+    build_url_regexp($domain = /(?:[a-z]+\.)?youtube/,
+                     $path = /watch\?(?:.*?&)?v=([A-Za-z0-9\-_]+)/),
     function enable (buffer) {
         media_setup_local_object_classes(buffer);
     },
diff --git a/modules/utils.js b/modules/utils.js
index 8aeb6b9..177fbdd 100644
--- a/modules/utils.js
+++ b/modules/utils.js
@@ -647,7 +647,7 @@ function scroll_selection_into_view (field) {
 
 
 /**
- * build_url_regex builds a regular expression to match URLs for a given
+ * build_url_regexp builds a regular expression to match URLs for a given
  * web site.
  *
  * Both the $domain and $path arguments can be either regexes, in
@@ -661,22 +661,22 @@ function scroll_selection_into_view (field) {
  * If $allow_www is true, www.domain.tld will also be allowed.
  */
 define_keywords("$domain", "$path", "$tlds", "$allow_www");
-function build_url_regex () {
-    function regex_to_string (obj) {
+function build_url_regexp () {
+    function regexp_to_string (obj) {
         if (typeof obj == "object" && "source" in obj)
             return obj.source;
         return quotemeta(obj);
     }
 
     keywords(arguments, $path = "", $tlds = ["com"], $allow_www = false);
-    var domain = regex_to_string(arguments.$domain);
+    var domain = regexp_to_string(arguments.$domain);
     if(arguments.$allow_www) {
         domain = "(?:www\.)?" + domain;
     }
-    var path   = regex_to_string(arguments.$path);
+    var path   = regexp_to_string(arguments.$path);
     var tlds   = arguments.$tlds;
-    var regex = "^https?://" + domain + "\\." + choice_regex(tlds) + "/" + path;
-    return new RegExp(regex);
+    var regexp = "^https?://" + domain + "\\." + choice_regex(tlds) + "/" + path;
+    return new RegExp(regexp);
 }
 
 
-- 
2.11.4.GIT