From 900e45999ec754fd76cab8ce05c8ff7bd57a6567 Mon Sep 17 00:00:00 2001
From: John Foerch <jjfoerch@earthlink.net>
Date: Mon, 20 Sep 2010 15:15:10 -0400
Subject: [PATCH] default_global_keymap: install via modalities system

---
 modules/bindings/default/bindings.js | 4 ++--
 modules/buffer.js                    | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/bindings/default/bindings.js b/modules/bindings/default/bindings.js
index 216e878..b2f4080 100644
--- a/modules/bindings/default/bindings.js
+++ b/modules/bindings/default/bindings.js
@@ -23,7 +23,7 @@ define_keymap("default_global_keymap", $parent = default_base_keymap);
 
 define_keymap("text_keymap");
 
-define_keymap("content_buffer_normal_keymap", $parent = default_global_keymap);
+define_keymap("content_buffer_normal_keymap");
 define_keymap("content_buffer_form_keymap");
 define_keymap("content_buffer_anchor_keymap");
 define_keymap("content_buffer_button_keymap");
@@ -34,7 +34,7 @@ define_keymap("content_buffer_textarea_keymap", $parent = content_buffer_text_ke
 define_keymap("content_buffer_richedit_keymap", $parent = content_buffer_textarea_keymap);
 define_keymap("content_buffer_embed_keymap");
 
-define_keymap("special_buffer_keymap", $parent = default_global_keymap);
+define_keymap("special_buffer_keymap");
 define_keymap("download_buffer_keymap", $parent = special_buffer_keymap);
 define_keymap("help_buffer_keymap", $parent = special_buffer_keymap);
 
diff --git a/modules/buffer.js b/modules/buffer.js
index c463813..925a0af 100644
--- a/modules/buffer.js
+++ b/modules/buffer.js
@@ -52,6 +52,10 @@ define_variable("allow_browser_window_close", true,
     "a window that was not opened by a script, the buffer will be " +
     "killed, deleting the window as well if it is the only buffer.");
 
+function buffer_modality (buffer) {
+    buffer.keymaps.push(default_global_keymap);
+}
+
 function buffer (window) {
     this.constructor_begin();
     keywords(arguments);
@@ -117,7 +121,7 @@ function buffer (window) {
         buffer.set_input_mode();
     }, true);
 
-    this.modalities = [];
+    this.modalities = [buffer_modality];
 
     // When create_buffer_hook_early runs, basic buffer properties
     // will be available, but not the properties subclasses.
-- 
2.11.4.GIT