@@ -1429,7 +1429,6 @@ public final String getSelectedText()
     }
   }
 
-
   /**
    * Replaces the selection with the specified text.
    * @param selectedText The replacement text for the selection
 
@@ -1572,6 +1572,11 @@ public void setSelectedText(String what) {
   }
 
 
+  public void setSelectedText(String what, boolean ever) {
+    textarea.setSelectedText(what, ever);
+  }
+
+
   public void setSelection(int start, int stop) {
     // make sure that a tool isn't asking for a bad location
     start = PApplet.constrain(start, 0, textarea.getDocumentLength());
 
@@ -417,15 +417,27 @@ protected void setFound(boolean found) {
     replaceAndFindButton.setEnabled(found);
   }
 
+/**
+ * Replace the current selection with whatever's in the
+   * replacement text field.
+ * @param isCompoundEdit True if the action is to be marked as a copmound edit
+ */
+  public void replace(boolean isCompoundEdit) {
+    editor.setSelectedText(replaceField.getText(), isCompoundEdit);
+    
+    editor.getSketch().setModified(true);  // This necessary- calling replace()
+    // doesn't seem to mark a sketch as modified
+    
+    setFound(false);
+  }
+
 
   /**
    * Replace the current selection with whatever's in the
-   * replacement text field.
+   * replacement text field, marking the action as a compound edit.
    */
   public void replace() {
-    editor.setSelectedText(replaceField.getText());
-    editor.getSketch().setModified(true);  // TODO is this necessary?
-    setFound(false);
+    replace(true);
   }
 
 
@@ -451,6 +463,8 @@ public void replaceAll() {
     int startTab = -1;
     int startIndex = -1;
     int counter = 10000;  // prevent infinite loop
+
+    editor.startCompoundEdit();
     while (--counter > 0) {
       if (find(false, false)) {
         int caret = editor.getSelectionStart();
@@ -467,11 +481,12 @@ public void replaceAll() {
           startTab = editor.getSketch().getCurrentCodeIndex();
           startIndex = editor.getSelectionStart();
         }
-        replace();
+        replace(false);
      } else {
         break;
       }
     }
+    editor.stopCompoundEdit();
     if (!foundAtLeastOne) {
       Toolkit.beep();
     }
Original file line number	Diff line number	Diff line change
@@ -1429,7 +1429,6 @@ public final String getSelectedText()
1429	1429	}
1430	1430	}
1431	1431
1432		-
1433	1432	/**
1434	1433	* Replaces the selection with the specified text.
1435	1434	* @param selectedText The replacement text for the selection