processing
diff --git a/‎app/src/processing/app/Editor.java‎
Lines changed: 8 additions & 1 deletion b/‎app/src/processing/app/Editor.java‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎app/src/processing/app/syntax/PdeTextAreaDefaults.java‎
Lines changed: 1 addition & 1 deletion b/‎app/src/processing/app/syntax/PdeTextAreaDefaults.java‎
Lines changed: 1 addition & 1 deletion
@@ -472,6 +472,9 @@ protected int getDividerLocation() {
    * with things in the Preferences window.
    */
   protected void applyPreferences() {
+    // All of this code was specific to using an external editor.  
+    // Keeping this around so we can update fonts.
+    /*
 //    // apply the setting for 'use external editor'
 //    boolean external = Preferences.getBoolean("editor.external");
 //    textarea.setEditable(!external);
@@ -494,7 +497,7 @@ protected void applyPreferences() {
 //    }
 
     // apply changes to the font size for the editor
-    painter.setFont(Preferences.getFont("editor.font"));
+//    painter.setFont(Preferences.getFont("editor.font"));
 
     // in case tab expansion stuff has changed
     // removing this, just checking prefs directly instead
@@ -505,6 +508,7 @@ protected void applyPreferences() {
     //sketchbook.rebuildMenus();
     // For 0126, moved into Base, which will notify all editors.
     //base.rebuildMenusAsync();
+     */
   }
 
 
@@ -2007,6 +2011,9 @@ protected boolean checkModified() {
     // As of Processing 1.0.10, this always happens immediately.
     // http://dev.processing.org/bugs/show_bug.cgi?id=1456
 
+    // With Java 7u40 on OS X, need to bring the window forward.
+    toFront();
+    
     String prompt = "Save changes to " + sketch.getName() + "?  ";
 
     if (!Base.isMacOS()) {
 
@@ -201,7 +201,7 @@ public PdeTextAreaDefaults(Mode mode) {
     int fontSize = Preferences.getInteger("editor.font.size");
     plainFont = new Font(fontFamily, Font.PLAIN, fontSize);
     boldFont = new Font(fontFamily, Font.BOLD, fontSize);
-    //System.out.println("font is " + plainFont.getFamily() + " / " + plainFont.getName() + " / " + plainFont.getFontName() + " / " + plainFont.getPSName());
+    System.out.println("font is " + plainFont.getFamily() + " / " + plainFont.getName() + " / " + plainFont.getFontName() + " / " + plainFont.getPSName());
 //    antialias = Preferences.getBoolean("editor.antialias");
 
     styles = new SyntaxStyle[Token.ID_COUNT];