Bugscape 12250. Dealing with keyboard conflict. r=jgaunt. sr=sfraser

content/xbl/builtin/htmlBindings.xml

@@ -48,6 +48,8 @@ Can't yet put script tags in XBL (hyatt has the bug)
       <handler event="keypress" key="v" command="cmd_paste" modifiers="accel"/>
       <handler event="keypress" key="z" command="cmd_undo" modifiers="accel"/>
       <handler event="keypress" key="a" command="cmd_selectAll" modifiers="accel"/>
+
+      <handler event="keypress" key="k" command="cmd_toggleBrowseWithCaret" modifiers="accel,shift"/>
     </handlers>
   </binding>
 

content/xbl/builtin/unix/platformHTMLBindings.xml

@@ -66,6 +66,8 @@
         command="cmd_selectWordNext"/>
     <handler event="keypress" key="y" modifiers="accel"
         command="cmd_redo"/>
+    <handler event="keypress" key="z" modifiers="accel,shift"
+        command="cmd_redo"/>
     <handler event="keypress" key="r" modifiers="accel"
         command="cmd_redo"/>
     <handler event="keypress" key="a" modifiers="alt"
@@ -151,6 +153,8 @@
         command="cmd_deleteWordBackward"/>
     <handler event="keypress" key="y" modifiers="accel"
         command="cmd_redo"/>
+    <handler event="keypress" key="z" modifiers="accel,shift"
+        command="cmd_redo"/>
     <handler event="keypress" key="r" modifiers="accel"
         command="cmd_redo"/>
     <handler event="keypress" key="a" modifiers="alt"
@@ -203,6 +207,7 @@
       <handler event="keypress" key="v" modifiers="control" command="cmd_paste"/>
       <handler event="keypress" key="z" modifiers="control" command="cmd_undo"/>
       <handler event="keypress" key="r" modifiers="accel"   command="cmd_redo"/>
+      <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo"/>
       <handler event="keypress" key="y" modifiers="accel"   command="cmd_redo"/>
       <handler event="keypress" key="a" modifiers="alt" command="cmd_selectAll"/>
       <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_cutOrDelete"/>

content/xbl/builtin/win/platformHTMLBindings.xml

@@ -32,6 +32,8 @@
         command="cmd_selectWordNext"/>
       <handler event="keypress" key="y" modifiers="accel"
         command="cmd_redo"/>
+      <handler event="keypress" key="z" modifiers="accel,shift"
+        command="cmd_redo"/>
 
       <handler event="keypress" keycode="VK_DELETE" modifiers="shift"
         command="cmd_cutOrDelete"/>
@@ -72,6 +74,7 @@
       <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
       <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
       <handler event="keypress" key="y" modifiers="accel" command="cmd_redo"/>
+      <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo"/>
 
       <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_cutOrDelete"/>
       <handler event="keypress" keycode="VK_DELETE" modifiers="control" command="cmd_deleteWordForward"/>
@@ -129,6 +132,7 @@
       <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
       <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
       <handler event="keypress" key="y" modifiers="accel" command="cmd_redo"/>
+      <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo"/>
     </handlers>
   </binding>
 </bindings>