From 0e35c7a288ce01bf748c3063194da9831d6bd75b Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 10 Aug 2012 09:16:08 -0400
Subject: [PATCH] Fix incfind annoyingness on newer Firefoxen.

--HG--
extra : rebase_source : 263fdb4bae4d1facff52ea436141491e5d58a8e5
---
 common/modules/finder.jsm | 4 +++-
 common/modules/util.jsm   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/modules/finder.jsm b/common/modules/finder.jsm
index 3dbe5d00..5addb732 100644
--- a/common/modules/finder.jsm
+++ b/common/modules/finder.jsm
@@ -12,7 +12,9 @@ defineModule("finder", {
 lazyRequire("buffer", ["Buffer"]);
 lazyRequire("overlay", ["overlay"]);
 
-function equals(a, b) XPCNativeWrapper(a) == XPCNativeWrapper(b);
+function id(w) w.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils)
+                .outerWindowID;
+function equals(a, b) id(a) == id(b);
 
 /** @instance rangefinder */
 var RangeFinder = Module("rangefinder", {
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 1ffd484f..28dd6869 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -364,7 +364,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
             }
             else if (close) {
                 stack.pop();
-                util.assert(stack.length, /*L*/"Unmatched %] in macro");
+                util.assert(stack.length, /*L*/"Unmatched }> in macro");
             }
             else {
                 let [, flags, name] = /^((?:[a-z]-)*)(.*)/.exec(macro);