From 25233a6df6573ed59fbbe92d2788f9cbb67742a9 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com" <blakeross%telocity.com>
Date: Mon, 22 Jan 2001 20:34:04 +0000
Subject: [PATCH] Fix 66135: use option, not command, for moving to and
 selecting previous/next word on mac. r=timeless sr=sfraser

---
 content/xbl/builtin/mac/platformHTMLBindings.xml          | 8 ++++----
 layout/xbl/builtin/mac/platformHTMLBindings.xml           | 8 ++++----
 .../resources/content/mac/platformEditorBindings.xul      | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/content/xbl/builtin/mac/platformHTMLBindings.xml b/content/xbl/builtin/mac/platformHTMLBindings.xml
index 2222a0ce12f..1e53880756a 100644
--- a/content/xbl/builtin/mac/platformHTMLBindings.xml
+++ b/content/xbl/builtin/mac/platformHTMLBindings.xml
@@ -113,10 +113,10 @@
       <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo" /> 
       <handler event="keypress" keycode="VK_HOME" command="cmd_scrollTop" /> 
       <handler event="keypress" keycode="VK_END" command="cmd_scrollBottom" /> 
-      <handler event="keypress" keycode="VK_LEFT" modifiers="meta" command="cmd_wordPrevious" /> 
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="meta" command="cmd_wordNext" /> 
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,meta" command="cmd_selectWordPrevious" /> 
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,meta" command="cmd_selectWordNext" /> 
+      <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="shift,alt" command="cmd_selectWordPrevious" /> 
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,alt" command="cmd_selectWordNext" /> 
       <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_deleteCharForward" /> 
     </handlers>
   </binding>
diff --git a/layout/xbl/builtin/mac/platformHTMLBindings.xml b/layout/xbl/builtin/mac/platformHTMLBindings.xml
index 2222a0ce12f..1e53880756a 100644
--- a/layout/xbl/builtin/mac/platformHTMLBindings.xml
+++ b/layout/xbl/builtin/mac/platformHTMLBindings.xml
@@ -113,10 +113,10 @@
       <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo" /> 
       <handler event="keypress" keycode="VK_HOME" command="cmd_scrollTop" /> 
       <handler event="keypress" keycode="VK_END" command="cmd_scrollBottom" /> 
-      <handler event="keypress" keycode="VK_LEFT" modifiers="meta" command="cmd_wordPrevious" /> 
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="meta" command="cmd_wordNext" /> 
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,meta" command="cmd_selectWordPrevious" /> 
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,meta" command="cmd_selectWordNext" /> 
+      <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="shift,alt" command="cmd_selectWordPrevious" /> 
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,alt" command="cmd_selectWordNext" /> 
       <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_deleteCharForward" /> 
     </handlers>
   </binding>
diff --git a/xpfe/communicator/resources/content/mac/platformEditorBindings.xul b/xpfe/communicator/resources/content/mac/platformEditorBindings.xul
index dd63e4da87a..0d79873cf6f 100644
--- a/xpfe/communicator/resources/content/mac/platformEditorBindings.xul
+++ b/xpfe/communicator/resources/content/mac/platformEditorBindings.xul
@@ -31,19 +31,19 @@
 <key id="key_leftcontrol" keycode="VK_LEFT"    
     oncommand="
       var controller = document.commandDispatcher.getControllerForCommand('cmd_wordPrevious');
-      controller.doCommand('cmd_wordPrevious');" modifiers="meta"/>
+      controller.doCommand('cmd_wordPrevious');" modifiers="alt"/>
 <key id="key_rightcontrol" keycode="VK_RIGHT"    
     oncommand="
       var controller = document.commandDispatcher.getControllerForCommand('cmd_wordNext');
-      controller.doCommand('cmd_wordNext');" modifiers="meta"/>
+      controller.doCommand('cmd_wordNext');" modifiers="alt"/>
 <key id="key_leftshiftcontrol" keycode="VK_LEFT"    
     oncommand="
       var controller = document.commandDispatcher.getControllerForCommand('cmd_selectWordPrevious');
-      controller.doCommand('cmd_selectWordPrevious');" modifiers="shift, meta"/>
+      controller.doCommand('cmd_selectWordPrevious');" modifiers="shift, alt"/>
 <key id="key_rightshiftcontrol" keycode="VK_RIGHT"    
     oncommand="
       var controller = document.commandDispatcher.getControllerForCommand('cmd_selectWordNext');
-      controller.doCommand('cmd_selectWordNext');" modifiers="shift, meta"/>
+      controller.doCommand('cmd_selectWordNext');" modifiers="shift, alt"/>
 
 </keyset>
 <!-- End Mac-specific key bindings -->