[Pkg-mozext-commits] [greasemonkey] 08/25: Merge commit '41c0f273ae7da2c169e4582363483d5184408463'

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository greasemonkey.

commit c456ee6ad951d90561bfcb6b7d0ab6dc2bbaab0c
Merge: 13a7d7c 41c0f27
Author: Anthony Lieuallen <arantius at gmail.com>
Date:   Fri Aug 15 11:16:18 2014 -0400

    Merge commit '41c0f273ae7da2c169e4582363483d5184408463'
    
    Conflicts:
    	modules/parseScript.js

 content/browser.js                 |  2 +-
 content/install.js                 |  4 +--
 content/scriptprefs.js             |  2 +-
 modules/addons4.js                 |  6 ++--
 modules/parseScript.js             | 13 +++++++--
 modules/remoteScript.js            |  2 +-
 modules/script.js                  | 58 ++++++++++++++++++++++++++++++++++++++
 modules/util/getBestLocaleMatch.js | 32 +++++++++++++++++++++
 modules/util/getPreferredLocale.js | 17 +++++++++++
 9 files changed, 126 insertions(+), 10 deletions(-)

diff --cc modules/parseScript.js
index f0cc154,32ebb10..f2b363d
--- a/modules/parseScript.js
+++ b/modules/parseScript.js
@@@ -12,8 -12,8 +12,8 @@@ var gIoService = Components.classes["@m
      .getService(Components.interfaces.nsIIOService);
  var gLineSplitRegexp = /.+/g;
  var gAllMetaRegexp = new RegExp(
 -    '^// ==UserScript==([\\s\\S]*?)^// ==/UserScript==', 'm');
 +    '^(\u00EF\u00BB\u00BF)?// ==UserScript==([\\s\\S]*?)^// ==/UserScript==', 'm');
- var gMetaLineRegexp = new RegExp('// @(\\S+)(?:\\s+(.*))?');
+ var gMetaLineRegexp = new RegExp('// @([^\\s:]+)(?::([a-zA-Z-]+))?(?:\\s+(.*))?');
  var gStringBundle = Components
      .classes["@mozilla.org/intl/stringbundle;1"]
      .getService(Components.interfaces.nsIStringBundleService)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/greasemonkey.git