backed out Merge functionality because it doesn't compile on Mac.

git-svn-id: svn://10.0.0.236/trunk@17752 18797224-902f-48f8-a5cc-f745e15eee43
1999-01-14 21:52:08 +00:00
parent 552637d5ff
commit 045c82cdbf
3 changed files with 6 additions and 3 deletions
--- a/mozilla/editor/core/InsertTextTxn.cpp
+++ b/mozilla/editor/core/InsertTextTxn.cpp
@@ -57,7 +57,7 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction)
  // set out param default value
  if (nsnull!=aDidMerge)
    *aDidMerge=PR_FALSE;
-
+/* XXX: Doesn't compile on Mac.  While the hell not???
  if ((nsnull!=aDidMerge) && (nsnull!=aTransaction))
  {
    // if aTransaction isa InsertTextTxn, absorb it
@@ -71,6 +71,7 @@ nsresult InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction)
    }
    *aDidMerge = PR_TRUE;
  }
+*/
  return NS_OK;
 }