From da0c4ca3f460f14fb96482ffb912907c09b9b74d Mon Sep 17 00:00:00 2001
From: Jeremy Maitin-Shepard <jeremy@jeremyms.com>
Date: Sat, 12 Apr 2008 03:19:29 -0400
Subject: [PATCH] bindings: use require instead of load_module to avoid
 problems due to duplicate loads

---
 modules/bindings/default/bindings.js               | 40 +++++++++++-----------
 modules/bindings/default/content-buffer/element.js |  1 +
 2 files changed, 21 insertions(+), 20 deletions(-)
 rewrite modules/bindings/default/bindings.js (95%)

diff --git a/modules/bindings/default/bindings.js b/modules/bindings/default/bindings.js
dissimilarity index 95%
index af8c432..2f6c23d 100644
--- a/modules/bindings/default/bindings.js
+++ b/modules/bindings/default/bindings.js
@@ -1,20 +1,20 @@
-
-// Simply load the other modules
-
-load_module("bindings/default/content-buffer/normal.js");
-load_module("bindings/default/content-buffer/text.js");
-load_module("bindings/default/content-buffer/checkbox.js");
-load_module("bindings/default/content-buffer/textarea.js");
-load_module("bindings/default/content-buffer/richedit.js");
-load_module("bindings/default/content-buffer/select.js");
-load_module("bindings/default/content-buffer/quote.js");
-
-load_module("bindings/default/minibuffer.js");
-load_module("bindings/default/hints.js");
-load_module("bindings/default/isearch.js");
-
-load_module("bindings/default/content-buffer/element.js");
-load_module("bindings/default/content-buffer/zoom.js");
-
-load_module("bindings/default/help-buffer.js");
-load_module("bindings/default/download-buffer.js");
+
+// Simply load the other modules
+
+require("bindings/default/content-buffer/normal.js");
+require("bindings/default/content-buffer/text.js");
+require("bindings/default/content-buffer/checkbox.js");
+require("bindings/default/content-buffer/textarea.js");
+require("bindings/default/content-buffer/richedit.js");
+require("bindings/default/content-buffer/select.js");
+require("bindings/default/content-buffer/quote.js");
+
+require("bindings/default/minibuffer.js");
+require("bindings/default/hints.js");
+require("bindings/default/isearch.js");
+
+require("bindings/default/content-buffer/element.js");
+require("bindings/default/content-buffer/zoom.js");
+
+require("bindings/default/help-buffer.js");
+require("bindings/default/download-buffer.js");
diff --git a/modules/bindings/default/content-buffer/element.js b/modules/bindings/default/content-buffer/element.js
index a7657c6..fa9ad13 100644
--- a/modules/bindings/default/content-buffer/element.js
+++ b/modules/bindings/default/content-buffer/element.js
@@ -1,3 +1,4 @@
+require("bindings/default/content-buffer/normal.js");
 require("element.js");
 
 define_keymap("browser_elements_keymap");
-- 
2.11.4.GIT