From d002ff6c451efc8f2e0fe4571a040cd88c77d2dd Mon Sep 17 00:00:00 2001
From: "ducarroz%netscape.com" <ducarroz%netscape.com>
Date: Fri, 4 Aug 2000 21:37:00 +0000
Subject: [PATCH] Fix for bug 47250. As we cannot have more than one keyset 
 per window, we need to define key outside the keyset tag in the overlay. That
 let other window that includes the overlay defines their own keyset and
 eventually includes some of the keys defined in the overlay. R=cmanske

---
 .../resources/content/messengercompose.xul    | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/mailnews/compose/resources/content/messengercompose.xul b/mailnews/compose/resources/content/messengercompose.xul
index efc80b1f43f..e045372c58b 100644
--- a/mailnews/compose/resources/content/messengercompose.xul
+++ b/mailnews/compose/resources/content/messengercompose.xul
@@ -194,8 +194,6 @@ Rights Reserved.
 </popupset>
 <popupset id="aTooltipSet"/>
 
-<keyset id="defaultKeySet"/> <!-- defined in editorOverlay.xul-->
-
 <keyset id="msgComposeKeySet">
 	<!-- File Menu -->
 	<key id="key_newNavigator"/>
@@ -206,8 +204,30 @@ Rights Reserved.
 	<key id="key_quit"/>
 	
 	<!-- Edit Menu -->
+  <key id="key_undo"/>
+  <key id="key_redo"/>
+  <key id="key_cut"/>
+  <key id="key_copy"/>
+  <key id="key_paste"/>
+  <key id="pastequotationkb"/>
+  <key id="key_delete"/>
+  <key id="key_selectAll"/>
 	<key id="key_find" xulkey="true" key="&findCmd.key;"  observes="cmd_find"/>
 	<key id="key_findNext" xulkey="true" key="&findAgainCmd.key;" observes="cmd_findNext"/>
+  <key id="key_preferences"/>
+
+	<!-- Format Menu -->
+  <key id="boldkb"/>
+  <key id="italickb"/>
+  <key id="underlinekb"/>
+
+  <key id="fontfixedwidthkb"/>
+  <key id="increaseindentkb"/>
+  <key id="decreaseindentkb"/>
+
+  <key id="removestyleskb"/>
+  <key id="decreasefontsizekb"/>
+  <key id="increasefontsizekb"/>
 
 	<!-- Options Menu -->
 	<!-- key id="key_selectAddresses" xulkey="true" key="&selectAddressCmd.key;" observes="cmd_selectAddress"/ -->