57078: Eliminate bogus xul bindings which were conflicting with XBL bindings.

Clean up XBL bindings and eliminate redundancies and errors.
       Fix a bug in which XBL bindings didn't check for event cancellation.
       r=brade sr=hyatt

content/xbl/builtin/htmlBindings.xml

@@ -119,7 +119,6 @@ Can't yet put script tags in XBL (hyatt has the bug)
 
   <binding id="inputFieldsBase">
     <handlers>
-
     <handler event="keypress" id="key_home" keycode="VK_HOME"
         command="cmd_beginLine"/>
     <handler event="keypress" id="key_end" keycode="VK_END"

content/xbl/builtin/mac/platformHTMLBindings.xml

@@ -7,6 +7,8 @@
   <binding id="inputFields" extends="resource:///res/builtin/htmlBindings.xml#inputFieldsBase">
     <handlers>
       
+      <handler event="keypress" key="a" modifiers="accel"
+        command="cmd_selectAll"/>
       <handler event="keypress" id="key_redo" key="z" modifiers="accel"
         command="cmd_redo"/>
 
@@ -28,9 +30,9 @@
       <handler event="keypress" id="key_end" keycode="VK_END" 
         command="cmd_endLine"/>
       <handler event="keypress" id="key_homeshift" keycode="VK_HOME" 
-        command="cmd_selectBeginLine"/>
-      <handler event="keypress" id="key_endshift" keycode="VK_END" modifiers="shift" 
-        command="cmd_selectEndLine"/>
+        modifiers="shift" command="cmd_selectBeginLine"/>
+      <handler event="keypress" id="key_endshift" keycode="VK_END"
+        modifiers="shift" command="cmd_selectEndLine"/>
       <handler event="keypress" id="key_leftalt" keycode="VK_LEFT" modifiers="alt" 
         command="cmd_wordPrevious"/>
       <handler event="keypress" id="key_rightalt" keycode="VK_RIGHT" modifiers="alt"
@@ -60,6 +62,8 @@
   <binding id="textAreas" extends="resource:///res/builtin/htmlBindings.xml#textAreasBase">
     <handlers>
 
+      <handler event="keypress" key="a" modifiers="accel"
+        command="cmd_selectAll"/>
       <handler event="keypress" id="key_redo" key="z" modifiers="accel,shift"
         command="cmd_redo"/>
 
@@ -106,6 +110,8 @@
 
   <binding id="browser">
     <handlers>
+      <handler event="keypress" key="a" modifiers="accel"
+        command="cmd_selectAll"/>
       <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_wordPrevious" />
       <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_wordNext" />
       <handler event="keypress" keycode="VK_LEFT" modifiers="alt,shift" command="cmd_selectWordPrevious" />
@@ -121,6 +127,8 @@
 
   <binding id="editor">
     <handlers>
+      <handler event="keypress" key="a" modifiers="accel"
+        command="cmd_selectAll"/>
       <handler event="keypress" key="y" modifiers="accel" oncommand="event.preventDefault();"/> 
       <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo" /> 
       <handler event="keypress" keycode="VK_HOME" command="cmd_scrollTop" /> 

content/xbl/builtin/unix/platformHTMLBindings.xml

@@ -6,7 +6,6 @@
  
   <binding id="inputFields" extends="resource:///res/builtin/htmlBindings.xml#inputFieldsBase">
     <handlers>
-
     <!-- Emacsish single-line motion and delete keys -->
     <handler event="keypress" id="key_home" key="a" modifiers="control"
         command="cmd_beginLine"/>

content/xbl/builtin/win/platformHTMLBindings.xml

@@ -11,6 +11,8 @@
       </xul:box>
     </content>-->
     <handlers>
+      <handler event="keypress" key="a" modifiers="accel"
+       command="cmd_selectAll"/>
       <handler event="keypress" keycode="VK_UP" command="cmd_charPrevious"/>
       <handler event="keypress" keycode="VK_DOWN" command="cmd_charNext"/>
       <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectCharPrevious"/>
@@ -53,6 +55,8 @@
 
   <binding id="textAreas" extends="resource:///res/builtin/htmlBindings.xml#textAreasBase">
     <handlers>
+      <handler event="keypress" key="a" modifiers="accel"
+       command="cmd_selectAll"/>
       <handler event="keypress" keycode="VK_HOME" 
         command="cmd_beginLine"/>
       <handler event="keypress" keycode="VK_END" 
@@ -84,6 +88,8 @@
 
   <binding id="browser">
     <handlers>
+      <handler event="keypress" key="a" modifiers="accel"
+       command="cmd_selectAll"/>
       <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_cut"/>
       <handler event="keypress" keycode="VK_DELETE" modifiers="control" command="cmd_copy"/>
       <handler event="keypress" keycode="VK_INSERT" modifiers="control" command="cmd_copy"/>
@@ -105,6 +111,8 @@
 
   <binding id="editor">
     <handlers>
+      <handler event="keypress" key="a" modifiers="accel"
+       command="cmd_selectAll"/>
       <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_cutOrDelete"/>
       <handler event="keypress" keycode="VK_DELETE" modifiers="control" command="cmd_copyOrDelete"/>
       <handler event="keypress" keycode="VK_INSERT" modifiers="control" command="cmd_copy"/>

content/xbl/src/nsXBLPrototypeHandler.cpp

@@ -189,6 +189,14 @@ nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventReceiver* aReceiver, nsIDOMEven
   if (!mHandlerElement)
     return NS_ERROR_FAILURE;
 
+  nsCOMPtr<nsIDOMNSUIEvent> uievent = do_QueryInterface(aEvent);
+  if (uievent) {
+    PRBool preventDefault;
+    uievent->GetPreventDefault(&preventDefault);
+    if (preventDefault)
+      return NS_OK;
+  }
+
   // See if our event receiver is a content node (and not us).
   PRBool isReceiverCommandElement = PR_FALSE;
   nsCOMPtr<nsIContent> content(do_QueryInterface(aReceiver));

xpfe/communicator/resources/content/browserBindings.xul

@@ -3,72 +3,4 @@
 
 <window id="browserBindings"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <keyset id="browserKeySet">
-    <key id="key_page_up" keycode="VK_PAGE_UP"   
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_scrollPageUp');
-            controller.doCommand('cmd_scrollPageUp');"/>
-    <key id="key_page_down" keycode="VK_PAGE_DOWN"   
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_scrollPageDown');
-            controller.doCommand('cmd_scrollPageDown');"/>
-    <key id="space" key=" "   
-        oncommand="
-			var v = document.commandDispatcher.focusedElement;
-			
-			if (v &amp;&amp; (v.localName == 'INPUT' || v.localName == 'TEXTAREA')) {
-			  return true;
-            }
-
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_scrollPageDown');
-            controller.doCommand('cmd_scrollPageDown');
-    "/>
-
-    <key id="key_page_up" keycode="VK_UP"   
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_scrollLineUp');
-            controller.doCommand('cmd_scrollLineUp');"/>
-    <key id="key_page_down" keycode="VK_DOWN"   
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_scrollLineDown');
-            controller.doCommand('cmd_scrollLineDown');"/>
-    <key id="key_left" keycode="VK_LEFT"    
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_scrollLeft');
-            controller.doCommand('cmd_scrollLeft');"/>
-    <key id="key_right" keycode="VK_RIGHT"    
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_scrollRight');
-            controller.doCommand('cmd_scrollRight');"/>
-
-    <key id="cutKey" key="x"  
-      oncommand="
-        var controller = document.commandDispatcher.getControllerForCommand('cmd_cut');
-        controller.doCommand('cmd_cut');" modifiers="accel"/>
-    <key id="copyKey" key="c"  
-      oncommand="
-        var controller = document.commandDispatcher.getControllerForCommand('cmd_copy');
-        controller.doCommand('cmd_copy');" modifiers="accel"/>
-    <key id="pasteKey" key="v"  
-      oncommand="
-        var controller = document.commandDispatcher.getControllerForCommand('cmd_paste');
-        controller.doCommand('cmd_paste');" modifiers="accel"/>
-    <key id="undoKey" key="z"  
-      oncommand="
-        var controller = document.commandDispatcher.getControllerForCommand('cmd_undo');
-        controller.doCommand('cmd_undo');" modifiers="accel"/>
-    <key id="redoKey" key="y"  
-      oncommand="
-        var controller = document.commandDispatcher.getControllerForCommand('cmd_redo');
-        controller.doCommand('cmd_redo');" modifiers="accel"/>
-
-	</keyset>
 </window>

xpfe/communicator/resources/content/editorBindings.xul

@@ -3,110 +3,4 @@
 <window id="editorBindings"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <keyset id="editorKeySet">
-    <key id="key_home" keycode="VK_HOME"    
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_beginLine');
-            controller.doCommand('cmd_beginLine');"/>
-    <key id="key_end" keycode="VK_END"    
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_endLine');
-            controller.doCommand('cmd_endLine');"/>
-    <key id="key_left" keycode="VK_LEFT"    
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_charPrevious');
-            controller.doCommand('cmd_charPrevious');"/>
-    <key id="key_right" keycode="VK_RIGHT"    
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_charNext');
-            controller.doCommand('cmd_charNext');"/>
-    <key id="key_homeshift" keycode="VK_HOME"    
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectBeginLine');
-            controller.doCommand('cmd_selectBeginLine');" modifiers="shift"/>
-    <key id="key_endshift" keycode="VK_END"    
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectEndLine');
-            controller.doCommand('cmd_selectEndLine');" modifiers="shift"/>
-    <key id="key_leftshift" keycode="VK_LEFT"    
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectCharPrevious');
-            controller.doCommand('cmd_selectCharPrevious');" modifiers="shift"/>
-    <key id="key_rightshift" keycode="VK_RIGHT"    
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectCharNext');
-            controller.doCommand('cmd_selectCharNext');" modifiers="shift"/>
-    <key id="key_pageup" keycode="VK_PAGE_UP"    
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_scrollPageUp');
-            controller.doCommand('cmd_scrollPageUp');"/>
-    <key id="key_pagedown" keycode="VK_PAGE_DOWN"     
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_scrollPageDown');
-            controller.doCommand('cmd_scrollPageDown');"/>
-    <key id="key_left" keycode="VK_UP"    
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_linePrevious');
-            controller.doCommand('cmd_linePrevious');"/>
-    <key id="key_right" keycode="VK_DOWN"    
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_lineNext');
-            controller.doCommand('cmd_lineNext');"/>
-    <key id="key_left_shift" keycode="VK_UP"   
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectLinePrevious');
-            controller.doCommand('cmd_selectLinePrevious');" modifiers="shift"/>
-    <key id="key_right_shift" keycode="VK_DOWN"   
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectLineNext');
-            controller.doCommand('cmd_selectLineNext');" modifiers="shift"/>
-    <key id="key_undo" key="z"  
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_undo');
-            controller.doCommand('cmd_undo');" modifiers="accel"/>
-    <key id="key_redo" key="y"  
-        oncommand="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_redo');
-            controller.doCommand('cmd_redo');" modifiers="accel"/>
-	<key id="key_space" key=" " cancel="true"/>
-
-<!-- cut, copy, paste, undo and redo keys -->
-<key id="edCutKey" key="x"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_cut');
-    controller.doCommand('cmd_cut');" modifiers="accel"/>
-<key id="edCopyKey" key="c"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_copy');
-    controller.doCommand('cmd_copy');" modifiers="accel"/>
-<key id="edPasteKey" key="v"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_paste');
-    controller.doCommand('cmd_paste');" modifiers="accel"/>
-<key id="edUndoKey" key="z"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_undo');
-    controller.doCommand('cmd_undo');" modifiers="accel"/>
-<key id="edRedoKey" key="r"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_redo');
-    controller.doCommand('cmd_redo');" modifiers="accel"/>
-
-  </keyset>
 </window>

xpfe/communicator/resources/content/unix/platformBrowserBindings.xul

@@ -1,45 +1,15 @@
 <?xml version="1.0"?> 
 <!-- unix version of platformBrowserBindings.xul -->
-
+<!-- This file is ONLY here to show bindings in the menus.        -->
+<!-- The real bindings come from XBL, in platformHTMLBindings.xml -->
+<!-- See bugs 57078 and 71779.                                    -->
+ 
 <keybinding id="platformBrowserBindings"
 	 xmlns:html="http://www.w3.org/1999/xhtml"
 	 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <keyset id="globalKeySet">
 
-<!-- other keybindings for cut/copy/paste -->
-<key id="winAlternativeCutKey" keycode="VK_DELETE"    
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_cut');
-    controller.doCommand('cmd_cut');" modifiers="shift"/>
-
-<key id="winAlternativeCopy2Key" keycode="VK_DELETE"    
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_copy');
-    controller.doCommand('cmd_copy');" modifiers="control"/>
-
-<key id="winAlternativeCopyKey" keycode="VK_INSERT"    
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_copy');
-    controller.doCommand('cmd_copy');" modifiers="control"/>
-
-<key id="winAlternativePasteKey" keycode="VK_INSERT"    
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_paste');
-    controller.doCommand('cmd_paste');" modifiers="shift"/>
-
-
-<key id="key_homectrlshift" keycode="VK_HOME"   
-    oncommand="
-        var controller =
-        document.commandDispatcher.getControllerForCommand('cmd_selectTop');
-        controller.doCommand('cmd_selectTop');" modifiers="shift, control"/>
-<key id="key_endctrlshift" keycode="VK_END"   
-    oncommand="
-        var controller =
-        document.commandDispatcher.getControllerForCommand('cmd_selectBottom');
-        controller.doCommand('cmd_selectBottom');" modifiers="shift, control"/>
-
 <key id="sparcCutKey" keycode="VK_F20"
     oncommand="
         var controller = document.commandDispatcher.getControllerForCommand('cmd_cut');

xpfe/communicator/resources/content/unix/platformEditorBindings.xul

@@ -1,128 +1,13 @@
 <?xml version="1.0"?> 
 <!-- unix version of platformEditorBindings.xul -->
+<!-- This file is ONLY here to show bindings in the menus.        -->
+<!-- The real bindings come from XBL, in platformHTMLBindings.xml -->
+<!-- See bugs 57078 and 71779.                                    -->
 
 <keybinding id="platformEditorBindings"
 	 xmlns:html="http://www.w3.org/1999/xhtml"
 	 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<keyset id="editorKeySet">
-
-<!-- emacs delete keys -->
-<key id="emDelCharBWkb" key="h"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_deleteCharBackward');
-    controller.doCommand('cmd_deleteCharBackward');" modifiers="control"/>
-<key id="emDelCharFWkb" key="d"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_deleteCharForward');
-    controller.doCommand('cmd_deleteCharForward');" modifiers="control"/>
-<key id="emKillToEndkb" key="k"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_deleteToEndOfLine');
-    controller.doCommand('cmd_deleteToEndOfLine');" modifiers="control"/>
-<key id="emKillToBegkb" key="u"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_deleteToBeginningOfLine');
-    controller.doCommand('cmd_deleteToBeginningOfLine');" modifiers="control"/>
-
-<!-- emacs motion keys: these use the selection controller API -->
-<key id="emBeginLinekb" key="a"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_beginLine');
-    controller.doCommand('cmd_beginLine');" modifiers="control"/>
-<key id="emEndLinekb" key="e"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_endLine');
-    controller.doCommand('cmd_endLine');" modifiers="control"/>
-<key id="emCharPrevkb" key="b"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_charPrevious');
-    controller.doCommand('cmd_charPrevious');" modifiers="control"/>
-<key id="emCharNextkb" key="f"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_charNext');
-    controller.doCommand('cmd_charNext');" modifiers="control"/>
-<key id="emPrevLinekb" key="p"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_linePrevious');
-    controller.doCommand('cmd_linePrevious');" modifiers="control"/>
-<key id="emNextLinekb" key="n"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_lineNext');
-    controller.doCommand('cmd_lineNext');" modifiers="control"/>
-
-<!-- Add the Windows/Mac cut, copy, paste, undo and redo keys -->
-<key id="emCutKey" key="x"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_cut');
-    controller.doCommand('cmd_cut');" modifiers="control"/>
-<key id="emCopyKey" key="c"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_copy');
-    controller.doCommand('cmd_copy');" modifiers="control"/>
-<key id="emPasteKey" key="v"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_paste');
-    controller.doCommand('cmd_paste');" modifiers="control"/>
-<key id="emUndoKey" key="z"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_undo');
-    controller.doCommand('cmd_undo');" modifiers="control"/>
-<key id="emRedoKey" key="r"  
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_redo');
-    controller.doCommand('cmd_redo');" modifiers="control"/>
-
-<key id="winAlternateCutKey" keycode="VK_DELETE"   
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_cut');
-    controller.doCommand('cmd_cut');" modifiers="shift"/>
-
-<key id="winAlternateCopy2Key" keycode="VK_DELETE"   
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_copy');
-    controller.doCommand('cmd_copy');" modifiers="control"/>
-
-<key id="winAlternateCopyKey" keycode="VK_INSERT"   
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_copy');
-    controller.doCommand('cmd_copy');" modifiers="control"/>
-<key id="winAlternatePasteKey" keycode="VK_INSERT"   
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_paste');
-    controller.doCommand('cmd_paste');" modifiers="shift"/>
-
-<key id="key_leftcontrol" keycode="VK_LEFT"   
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_wordPrevious');
-    controller.doCommand('cmd_wordPrevious');" modifiers="control"/>
-<key id="key_rightcontrol" keycode="VK_RIGHT"   
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_wordNext');
-    controller.doCommand('cmd_wordNext');" modifiers="control"/>
-<key id="key_leftshiftcontrol" keycode="VK_LEFT"   
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_selectWordPrevious');
-    controller.doCommand('cmd_selectWordPrevious');" modifiers="shift, control"/>
-<key id="key_rightshiftcontrol" keycode="VK_RIGHT"   
-  oncommand="
-    var controller = document.commandDispatcher.getControllerForCommand('cmd_selectWordNext');
-    controller.doCommand('cmd_selectWordNext');" modifiers="shift, control"/>
-
-
-<key id="key_homectrlshift" keycode="VK_HOME"   
-    oncommand="
-        var controller =
-        document.commandDispatcher.getControllerForCommand('cmd_selectTop');
-        controller.doCommand('cmd_selectTop');" modifiers="shift, control"/>
-<key id="key_endctrlshift" keycode="VK_END"   
-    oncommand="
-        var controller =
-        document.commandDispatcher.getControllerForCommand('cmd_selectBottom');
-        controller.doCommand('cmd_selectBottom');" modifiers="shift, control"/>
-
-</keyset>
-
 <!-- End Unix-specific keybindings -->
 
 </keybinding>

xpfe/communicator/resources/content/unix/platformGlobalOverlay.xul

@@ -20,9 +20,5 @@
 	
     <!-- Edit Menu -->
     <menuitem id="menu_redo" value="&redoCmd.label;" key="key_redo" accesskey="&redoCmd.accesskey;" observes="cmd_redo"/>
-    <key id="key_redo"   key="&redoCmd.key;" observes="cmd_redo" modifiers="accel, shift"/>
-	
-	<!-- Delete Key -->
-	<key id="key_delete" keycode="VK_DELETE"     observes="cmd_delete"/>
 
 </overlay>		

xpfe/communicator/resources/content/utilityOverlay.xul

@@ -25,8 +25,6 @@
   <statusbarpanel id="offline-status" tooltip="aTooltip" observes="Communicator:WorkMode"/>
   <menuitem id="offlineGoOfflineCmd" accesskey="&offlineGoOfflineCmd.accesskey;" observes="Communicator:WorkMode"/>
 
-
-
 	<!-- File Menu -->
 	<menu id="menu_File" value="&fileMenu.label;" accesskey="&fileMenu.accesskey;"/>
 	
@@ -58,12 +56,15 @@
 	<menuitem id="menu_delete" value="&deleteCmd.label;" key="key_delete" accesskey="&deleteCmd.accesskey;" observes="cmd_delete"/>
 	<menuitem id="menu_selectAll" value="&selectAllCmd.label;" key="key_selectAll" accesskey="&selectAllCmd.accesskey;" observes="cmd_selectAll"/>
 	
-	<key id="key_undo"  key="&undoCmd.key;"  observes="cmd_undo" modifiers="accel"/>
-	<key id="key_redo"  key="&redoCmd.key;"  observes="cmd_redo" modifiers="accel"/>
-	<key id="key_cut"  key="&cutCmd.key;"  observes="cmd_cut" modifiers="accel"/>
-	<key id="key_copy"  key="&copyCmd.key;"  observes="cmd_copy" modifiers="accel"/>
-	<key id="key_paste"  key="&pasteCmd.key;"  observes="cmd_paste" modifiers="accel"/>
-	<key id="key_selectAll"  key="&selectAllCmd.key;"  observes="cmd_selectAll" modifiers="accel"/>
+	<!-- These key nodes are here only for show.                       -->
+	<!-- The real bindings come from XBL, in platformHTMLBindings.xml. -->
+	<!-- See bugs 57078 and 71779.                                     -->
+	<key id="key_undo"  key="&undoCmd.key;"  modifiers="accel"/>
+	<key id="key_redo"  key="&redoCmd.key;"  modifiers="accel"/>
+	<key id="key_cut"  key="&cutCmd.key;"  modifiers="accel"/>
+	<key id="key_copy"  key="&copyCmd.key;"  modifiers="accel"/>
+	<key id="key_paste"  key="&pasteCmd.key;"  modifiers="accel"/>
+	<key id="key_selectAll"  key="&selectAllCmd.key;"  modifiers="accel"/>
  
 	<commandset id="globalEditMenuItems"
 					commandupdater="true"

xpfe/global/resources/content/unix/platformGlobalOverlay.xul

@@ -20,7 +20,6 @@
 	
     <!-- Edit Menu -->
     <menuitem id="menu_redo" value="&redoCmd.label;" key="key_redo" accesskey="&redoCmd.accesskey;" observes="cmd_redo"/>
-    <key id="key_redo"   key="&redoCmd.key;" observes="cmd_redo" modifiers="accel, shift"/>
 	
 	<!-- Delete Key -->
 	<key id="key_delete" keycode="VK_DELETE" observes="cmd_delete"/>

xpfe/global/resources/locale/en-US/unix/platformGlobalOverlay.dtd

@@ -10,5 +10,5 @@
 <!ENTITY quitApplicationCmd.accesskey		"q">
 
 <!ENTITY redoCmd.label						"Redo">  
-<!ENTITY redoCmd.key						"Z">  
+<!ENTITY redoCmd.key						"Y">  
 <!ENTITY redoCmd.accesskey					"r">