diff --git a/docshell/base/nsDocShellEditorData.cpp b/docshell/base/nsDocShellEditorData.cpp
index 5d457733f834..ea0ed3629f39 100644
--- a/docshell/base/nsDocShellEditorData.cpp
+++ b/docshell/base/nsDocShellEditorData.cpp
@@ -53,7 +53,7 @@ nsDocShellEditorData::~nsDocShellEditorData()
 {
   // Get editing session on the root docShell
   nsCOMPtr <nsIEditingSession> editingSession;
-  nsresult rv = GetOrCreateEditingSession(getter_AddRefs(editingSession), PR_FALSE);
+  nsresult rv = GetOrCreateEditingSession(PR_FALSE, getter_AddRefs(editingSession));
 
   if (editingSession)
   {
@@ -136,7 +136,7 @@ nsresult
 nsDocShellEditorData::GetEditingSession(nsIEditingSession **outEditingSession)
 {
   NS_ENSURE_ARG_POINTER(outEditingSession);
-  return GetOrCreateEditingSession(outEditingSession, PR_TRUE);
+  return GetOrCreateEditingSession(PR_TRUE, outEditingSession);
 }
 
 
@@ -189,7 +189,7 @@ nsDocShellEditorData::SetEditor(nsIEditor *inEditor)
 
 ----------------------------------------------------------------------------*/
 nsresult
-nsDocShellEditorData::GetOrCreateEditingSession(nsIEditingSession **outEditingSession, PRBool inAllowCreation)
+nsDocShellEditorData::GetOrCreateEditingSession(PRBool inAllowCreation, nsIEditingSession **outEditingSession)
 {
   NS_ENSURE_ARG_POINTER(outEditingSession);
   *outEditingSession = nsnull;
diff --git a/docshell/base/nsDocShellEditorData.h b/docshell/base/nsDocShellEditorData.h
index f1e10576ae9d..ae91868ab37d 100644
--- a/docshell/base/nsDocShellEditorData.h
+++ b/docshell/base/nsDocShellEditorData.h
@@ -69,7 +69,7 @@ public:
 
 protected:              
 
-  nsresult    GetOrCreateEditingSession(nsIEditingSession **outEditingSession, PRBool inAllowCreation);
+  nsresult    GetOrCreateEditingSession(PRBool inAllowCreation, nsIEditingSession **outEditingSession);
 
 protected:
 
diff --git a/docshell/base/nsIEditorDocShell.idl b/docshell/base/nsIEditorDocShell.idl
index db20e4d9a6bd..006ad4787514 100644
--- a/docshell/base/nsIEditorDocShell.idl
+++ b/docshell/base/nsIEditorDocShell.idl
@@ -17,7 +17,8 @@
  * Copyright (C) 1999, Mozilla.  All Rights Reserved.
  * 
  * Contributor(s):
- *   Simon Fraser <sfraser@netscape.com>
+ *   Simon Fraser   <sfraser@netscape.com>
+ *   Charles Manske <cmanske@netscape.com>
  */
 
 #include "nsISupports.idl"
@@ -45,7 +46,6 @@ interface nsIEditorDocShell : nsISupports
      *      @param  inWaitForUriLoad    true to wait for a URI before
      *                                  creating the editor.
      */     
-    void        makeEditable(in boolean inWaitForUriLoad);
-    
+    void makeEditable(in boolean inWaitForUriLoad);
 };