Index: core/ui/src/org/netbeans/core/ui/resources/layer.xml
===================================================================
RCS file: /cvs/core/ui/src/org/netbeans/core/ui/resources/layer.xml,v
retrieving revision 1.70
diff -u -u -r1.70 layer.xml
--- core/ui/src/org/netbeans/core/ui/resources/layer.xml	31 Jul 2004 14:26:51 -0000	1.70
+++ core/ui/src/org/netbeans/core/ui/resources/layer.xml	31 Jul 2004 17:27:37 -0000
@@ -270,7 +270,12 @@
 	    <attr name="instanceClass" stringvalue="org.openide.actions.CutAction"/>
 	</file>
     
-        <file name="C-G.instance">
+        <!-- X- comes from issue 26854 - remap CTRL to Command on mac.  We actually
+             don't want to remap this, because on the mac, Command-G is Find Next.
+             The X- prepended specifies that this is an explicit mapping which
+             should not be remapped on the mac.  See Issue 46808.
+         -->
+        <file name="X-C-G.instance">
 	    <attr name="instanceClass" stringvalue="org.openide.actions.GotoAction"/>
 	</file>
 
Index: editor/libsrc/org/netbeans/editor/SettingsDefaults.java
===================================================================
RCS file: /cvs/editor/libsrc/org/netbeans/editor/SettingsDefaults.java,v
retrieving revision 1.33
diff -u -u -r1.33 SettingsDefaults.java
--- editor/libsrc/org/netbeans/editor/SettingsDefaults.java	25 May 2004 13:29:08 -0000	1.33
+++ editor/libsrc/org/netbeans/editor/SettingsDefaults.java	31 Jul 2004 17:27:46 -0000
@@ -191,6 +191,16 @@
           SettingsNames.STATUS_BAR_BOLD_COLORING
       };
 
+    
+    private static final int FIND_NEXT_KEY = 
+        System.getProperty("mrj.version") == null ?
+        KeyEvent.VK_F3 : KeyEvent.VK_G;
+        
+    private static final int FIND_NEXT_MASK = 
+        System.getProperty("mrj.version") == null ?
+        0 : KeyEvent.META_DOWN_MASK;
+        
+        
     public static final MultiKeyBinding[] defaultKeyBindings
     = new MultiKeyBinding[] {
           new MultiKeyBinding(
@@ -455,15 +465,15 @@
               BaseKit.gotoNextBookmarkAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_F3, 0),
+              KeyStroke.getKeyStroke(FIND_NEXT_KEY, FIND_NEXT_MASK),
               BaseKit.findNextAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_F3, InputEvent.SHIFT_MASK),
+              KeyStroke.getKeyStroke(FIND_NEXT_KEY, FIND_NEXT_MASK | InputEvent.SHIFT_MASK),
               BaseKit.findPreviousAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_F3, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(FIND_NEXT_KEY, FIND_NEXT_MASK | InputEvent.CTRL_MASK),
               BaseKit.findSelectionAction
           ),
           new MultiKeyBinding(