diff --git a/src/juce_appframework/gui/components/controls/juce_TextEditor.h b/src/juce_appframework/gui/components/controls/juce_TextEditor.h
index 11336d8e83..b969a85491 100644
--- a/src/juce_appframework/gui/components/controls/juce_TextEditor.h
+++ b/src/juce_appframework/gui/components/controls/juce_TextEditor.h
@@ -501,6 +501,7 @@ l    */
     juce_UseDebuggingNewOperator
 
 protected:
+    //==============================================================================
     /** This adds the items to the popup menu.
 
         By default it adds the cut/copy/paste items, but you can override this if
@@ -533,6 +534,7 @@ protected:
     */
     virtual void performPopupMenuAction (const int menuItemID);
 
+    //==============================================================================
     /** Scrolls the minimum distance needed to get the caret into view. */
     void scrollToMakeSureCursorIsVisible() throw();
 
@@ -559,13 +561,17 @@ protected:
     /** Used internally to trigger an undo or redo. */
     void doUndoRedo (const bool isRedo);
 
-    /** @internal */
-    void handleCommandMessage (int commandId);
-
+    /** Can be overridden to intercept return key presses directly */
     virtual void returnPressed();
+
+    /** Can be overridden to intercept escape key presses directly */
     virtual void escapePressed();
 
+    /** @internal */
+    void handleCommandMessage (int commandId);
+
 private:
+    //==============================================================================
     Viewport* viewport;
     TextHolderComponent* textHolder;
     BorderSize borderSize;
@@ -593,7 +599,6 @@ private:
     VoidArray sections;
     String textToShowWhenEmpty;
     Colour colourForTextWhenEmpty;
-
     tchar passwordCharacter;
 
     enum