diff --git a/editor/base/nsEditorEventListeners.cpp b/editor/base/nsEditorEventListeners.cpp
index 87adfa09123..e49bf6aa35b 100644
--- a/editor/base/nsEditorEventListeners.cpp
+++ b/editor/base/nsEditorEventListeners.cpp
@@ -238,6 +238,8 @@ nsresult
 nsTextEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aProcessed)
 {
   aProcessed=PR_FALSE;
+
+#ifdef USE_OLD_OBSOLETE_HARDWIRED_SHORTCUT_KEYS
   PRUint32 charCode;
 
   nsCOMPtr<nsIDOMKeyEvent>keyEvent;
@@ -317,6 +319,7 @@ nsTextEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aPr
       }
     }
   }
+#endif
   return NS_OK;
 }
 
diff --git a/editor/libeditor/text/nsEditorEventListeners.cpp b/editor/libeditor/text/nsEditorEventListeners.cpp
index 87adfa09123..e49bf6aa35b 100644
--- a/editor/libeditor/text/nsEditorEventListeners.cpp
+++ b/editor/libeditor/text/nsEditorEventListeners.cpp
@@ -238,6 +238,8 @@ nsresult
 nsTextEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aProcessed)
 {
   aProcessed=PR_FALSE;
+
+#ifdef USE_OLD_OBSOLETE_HARDWIRED_SHORTCUT_KEYS
   PRUint32 charCode;
 
   nsCOMPtr<nsIDOMKeyEvent>keyEvent;
@@ -317,6 +319,7 @@ nsTextEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aPr
       }
     }
   }
+#endif
   return NS_OK;
 }