diff --git a/Frameworks/AppKit/Browser.environment/AppKit.sj b/Frameworks/AppKit/Browser.environment/AppKit.sj
index eb05aace6..076636ea4 100644
--- a/Frameworks/AppKit/Browser.environment/AppKit.sj
+++ b/Frameworks/AppKit/Browser.environment/AppKit.sj
@@ -70388,7 +70388,7 @@ var meta_class = the_class.isa;class_addMethods(the_class, [new objj_method(sel_
 
 ,["void"])]);
 }
-p;12;CPTextView.jt;199294;@STATIC;1.0;i;8;CPText.ji;14;CPPasteboard.ji;14;CPColorPanel.ji;15;CPFontManager.ji;15;CPTextStorage.ji;17;CPTextContainer.ji;17;CPLayoutManager.ji;14;_CPRTFParser.ji;16;_CPRTFProducer.jt;199099;objj_executeFile("CPText.j", YES);objj_executeFile("CPPasteboard.j", YES);objj_executeFile("CPColorPanel.j", YES);objj_executeFile("CPFontManager.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CPLayoutManager.j", YES);objj_executeFile("_CPRTFParser.j", YES);objj_executeFile("_CPRTFProducer.j", YES);;
+p;12;CPTextView.jt;199848;@STATIC;1.0;i;8;CPText.ji;14;CPPasteboard.ji;14;CPColorPanel.ji;15;CPFontManager.ji;15;CPTextStorage.ji;17;CPTextContainer.ji;17;CPLayoutManager.ji;14;_CPRTFParser.ji;16;_CPRTFProducer.jt;199653;objj_executeFile("CPText.j", YES);objj_executeFile("CPPasteboard.j", YES);objj_executeFile("CPColorPanel.j", YES);objj_executeFile("CPFontManager.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CPLayoutManager.j", YES);objj_executeFile("_CPRTFParser.j", YES);objj_executeFile("_CPRTFProducer.j", YES);;
 ;
 ;
 ;
@@ -71994,6 +71994,8 @@ class_addMethods(the_class, [new objj_method(sel_getUid("allowsUndo"), function
         }
         else
         {
+            attributes = ((___r1 = self._textStorage), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["attributesAtIndex:longestEffectiveRange:inRange:"] || _objj_forward)(___r1, "attributesAtIndex:longestEffectiveRange:inRange:", self._selectionRange.location, self._selectionRange, self._selectionRange));
+            oldFont = (attributes == null ? attributes : (attributes.isa.method_msgSend["objectForKey:"] || _objj_forward)(attributes, "objectForKey:", CPFontAttributeName)) || (self.isa.method_msgSend["font"] || _objj_forward)(self, "font");
             ((___r1 = self._typingAttributes), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setObject:forKey:"] || _objj_forward)(___r1, "setObject:forKey:", (sender == null ? sender : (sender.isa.method_msgSend["convertFont:"] || _objj_forward)(sender, "convertFont:", oldFont)), CPFontAttributeName));
         }
     }
diff --git a/Frameworks/AppKit/CommonJS.environment/AppKit.sj b/Frameworks/AppKit/CommonJS.environment/AppKit.sj
index efaf9f274..9dd2bab99 100644
--- a/Frameworks/AppKit/CommonJS.environment/AppKit.sj
+++ b/Frameworks/AppKit/CommonJS.environment/AppKit.sj
@@ -68234,7 +68234,7 @@ var meta_class = the_class.isa;class_addMethods(the_class, [new objj_method(sel_
 
 ,["void"])]);
 }
-p;12;CPTextView.jt;184854;@STATIC;1.0;i;8;CPText.ji;14;CPPasteboard.ji;14;CPColorPanel.ji;15;CPFontManager.ji;15;CPTextStorage.ji;17;CPTextContainer.ji;17;CPLayoutManager.ji;14;_CPRTFParser.ji;16;_CPRTFProducer.jt;184659;objj_executeFile("CPText.j", YES);objj_executeFile("CPPasteboard.j", YES);objj_executeFile("CPColorPanel.j", YES);objj_executeFile("CPFontManager.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CPLayoutManager.j", YES);objj_executeFile("_CPRTFParser.j", YES);objj_executeFile("_CPRTFProducer.j", YES);;
+p;12;CPTextView.jt;185408;@STATIC;1.0;i;8;CPText.ji;14;CPPasteboard.ji;14;CPColorPanel.ji;15;CPFontManager.ji;15;CPTextStorage.ji;17;CPTextContainer.ji;17;CPLayoutManager.ji;14;_CPRTFParser.ji;16;_CPRTFProducer.jt;185213;objj_executeFile("CPText.j", YES);objj_executeFile("CPPasteboard.j", YES);objj_executeFile("CPColorPanel.j", YES);objj_executeFile("CPFontManager.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CPLayoutManager.j", YES);objj_executeFile("_CPRTFParser.j", YES);objj_executeFile("_CPRTFProducer.j", YES);;
 ;
 ;
 ;
@@ -69797,6 +69797,8 @@ class_addMethods(the_class, [new objj_method(sel_getUid("allowsUndo"), function
         }
         else
         {
+            attributes = ((___r1 = self._textStorage), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["attributesAtIndex:longestEffectiveRange:inRange:"] || _objj_forward)(___r1, "attributesAtIndex:longestEffectiveRange:inRange:", self._selectionRange.location, self._selectionRange, self._selectionRange));
+            oldFont = (attributes == null ? attributes : (attributes.isa.method_msgSend["objectForKey:"] || _objj_forward)(attributes, "objectForKey:", CPFontAttributeName)) || (self.isa.method_msgSend["font"] || _objj_forward)(self, "font");
             ((___r1 = self._typingAttributes), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setObject:forKey:"] || _objj_forward)(___r1, "setObject:forKey:", (sender == null ? sender : (sender.isa.method_msgSend["convertFont:"] || _objj_forward)(sender, "convertFont:", oldFont)), CPFontAttributeName));
         }
     }
diff --git a/Resources/recipes.txt b/Resources/recipes.txt
index 87ae6a0f7..544001c3e 100644
--- a/Resources/recipes.txt
+++ b/Resources/recipes.txt
@@ -1,143 +1,143 @@
-1769970705581|ArrayController1|
-1769970705595|ArrayControllerInitialSelectionTest|
-1769970705608|ArrayControllerRemovingFirstTest|
-1769970705621|AttachedSheet|
-1769970705634|AttachedSheet2|
-1769970705648|Bindings|
-1769970705661|CGCanvasContext|
-1769970705674|CGPath|
-1769970705687|CPAlertTest|
-1769970705701|CPAnimatablePropertyContainerTest|
-1769970705714|CPAnimationContextTest|
-1769970705727|CPAnimationTest|
-1769970705740|CPBinder-echo-bug|
-1769970705754|CPBoxCibTest|
-1769970705767|CPBoxTest|
-1769970705780|CPBrowserTest|
-1769970705793|CPButtonKeyEquivalentDefaultTest|
-1769970705807|CPButtonTest|
-1769970705820|CPByteCountFormatter|
-1769970705833|CPCollectionViewNibTest|
-1769970705846|CPColor-CPImage-description|
-1769970705860|CPColorWellBindings|
-1769970705873|CPComboBoxTest|
-1769970705886|CPControlPerformClickExceptionTest|
-1769970705900|CPControlSize|
-1769970705913|CPCursor|
-1769970705926|CPDateFormatterTest|
-1769970705940|CPDatePickerTest|
-1769970705953|CPDictionaryControllerTest|
-1769970705966|CPDocumentControllerTest|
-1769970705979|CPFormatterTest|
-1769970705993|CPGraphicsTest|
-1769970706006|CPImageAndTextViewImageScaling|
-1769970706019|CPImageViewAlignmentScaling|
-1769970706032|CPImageViewTest|
-1769970706046|CPImageViewbindingsTest|
-1769970706059|CPLevelIndicator|
-1769970706072|CPLocalizationTest|
-1769970706086|CPLogTest|
-1769970706099|CPMenuCALayerTest|
-1769970706112|CPMenuEnabledBindingsTest|
-1769970706126|CPMenuKeyEquivalents|
-1769970706139|CPMenuRemoveAllTest|
-1769970706152|CPMenuSubmenuPlacementConstraints|
-1769970706165|CPMenuTest|
-1769970706179|CPOutlineViewCibTest|
-1769970706192|CPOutlineViewTest|
-1769970706206|CPOutlineViewViewBasedCibTest|
-1769970706219|CPPanelTest|
-1769970706232|CPPlatformWindow|
-1769970706245|CPPlattformWindowMinSize|
-1769970706259|CPPopUpButtonBindings|
-1769970706272|CPPopUpButtonTest|
-1769970706285|CPPopover|
-1769970706298|CPPredicateEditorCibTest|
-1769970706312|CPProgressIndicator|
-1769970706325|CPPropertyListSerializationTest|
-1769970706338|CPRadioBindings|
-1769970706351|CPRuleEditorCibTest|
-1769970706365|CPScrollView|
-1769970706378|CPScrollView2|
-1769970706391|CPSearchField|
-1769970706404|CPSearchFieldPredicateBinding|
-1769970706418|CPSegmentedControlBindings|
-1769970706431|CPSegmentedControlTest|
-1769970706444|CPSoundTest|
-1769970706457|CPSplitViewDivider|
-1769970706471|CPSplitViewTest|
-1769970706484|CPStackViewTest|
-1769970706497|CPStepperBindings|
-1769970706510|CPStepperNibTest|
-1769970706524|CPTabView2|
-1769970706537|CPTabViewBindings|
-1769970706550|CPTabViewNib|
-1769970706563|CPTableViewGroupRows|
-1769970706577|CPTextField|
-1769970706590|CPTextFieldEditingStyleTest|
-1769970706603|CPTextFieldHeightTest|
-1769970706616|CPTextFieldMovementsTest|
-1769970706630|CPTextFieldMultiline|
-1769970706643|CPTextView|
-1769970706656|CPTextViewCibTest|
-1769970706669|CPTextViewDelegateAndNotifications|
-1769970706683|CPTimeZone|
-1769970706696|CPTokenFieldTest|
-1769970706709|CPToolTip|
-1769970706722|CPToolbarTest|
-1769970706736|CPURLConnectionAsyncTest|
-1769970706749|CPURLConnectionSynchronousTest|
-1769970706762|CPUserDefaults|
-1769970706775|CPUserDefaultsControllerTest|
-1769970706788|CPUserNotificationTest|
-1769970706802|CPViewController|
-1769970706815|CPVisualEffectViewTest|
-1769970706828|CPWebViewTest|
-1769970706841|CPWebViewTest2|
-1769970706855|CPWindowLiveResizeTest|
-1769970706868|CPWindowMovableTest|
-1769970706881|CPWindowResizeStyle|
-1769970706895|ChildWindows|
-1769970706908|CompilationTests|
-1769970706921|ContinuouslyUpdatesValueBinding|
-1769970706934|CopyAndPaste|
-1769970706948|CrossOriginTest|
-1769970706961|FF4096Test|
-1769970706974|FontEnhancementTest|
-1769970706987|FontMetricsExplorer|
-1769970707001|KeyEquivalents|
-1769970707014|KeyViewLoopTest|
-1769970707027|KeyWindowInTheBackgroundActivation|
-1769970707040|LayoutTest|
-1769970707054|LoadTimeTest|
-1769970707067|LongBindings|
-1769970707080|MobileTest|
-1769970707093|MultipleValueBindings|
-1769970707107|NSBoxTest|
-1769970707120|NSBrowserTest|
-1769970707133|NewTextFieldBezel|
-1769970707146|Nib2CibAlignment|
-1769970707159|Nib2CibBaselineAlignementTest|
-1769970707173|Nib2CibSubviewsOrderTest|
-1769970707186|NibAppRemixed|
-1769970707199|PatternFillTest|
-1769970707212|PlatformWindows|
-1769970707226|PopUpButtonEscTest|
-1769970707239|ScalingTest|
-1769970707252|ScalingTest2|
-1769970707265|ScrollviewTheming|
-1769970707279|SheetWindowOrderFrontIssue|
-1769970707292|SimpleBindings2|
-1769970707305|SmartFoldersDemo|
-1769970707319|TableTest|
-1769970707332|ThemeBrowser|
-1769970707345|ThemeKitchenSink|
-1769970707359|TrackingArea|
-1769970707372|UndoRedoWithMenuUpdate|
-1769970707385|UserlandNSTest|
-1769970707398|layoutEphemeralSubviewTest|
-1769970707412|loadDynamicFrameworks|
-1769970707425|performKeyEquivalentTest|
-1769970707438|predicateWithFormat|
-1769970707451|resignFirstResponder-CPControlTextDidEndEditing|
-1769970707465|sizeToFitFix|
+1769971484747|ArrayController1|
+1769971484761|ArrayControllerInitialSelectionTest|
+1769971484774|ArrayControllerRemovingFirstTest|
+1769971484787|AttachedSheet|
+1769971484801|AttachedSheet2|
+1769971484814|Bindings|
+1769971484827|CGCanvasContext|
+1769971484841|CGPath|
+1769971484854|CPAlertTest|
+1769971484868|CPAnimatablePropertyContainerTest|
+1769971484881|CPAnimationContextTest|
+1769971484894|CPAnimationTest|
+1769971484908|CPBinder-echo-bug|
+1769971484921|CPBoxCibTest|
+1769971484934|CPBoxTest|
+1769971484948|CPBrowserTest|
+1769971484961|CPButtonKeyEquivalentDefaultTest|
+1769971484975|CPButtonTest|
+1769971484988|CPByteCountFormatter|
+1769971485002|CPCollectionViewNibTest|
+1769971485015|CPColor-CPImage-description|
+1769971485028|CPColorWellBindings|
+1769971485042|CPComboBoxTest|
+1769971485055|CPControlPerformClickExceptionTest|
+1769971485068|CPControlSize|
+1769971485082|CPCursor|
+1769971485095|CPDateFormatterTest|
+1769971485108|CPDatePickerTest|
+1769971485122|CPDictionaryControllerTest|
+1769971485135|CPDocumentControllerTest|
+1769971485148|CPFormatterTest|
+1769971485161|CPGraphicsTest|
+1769971485175|CPImageAndTextViewImageScaling|
+1769971485188|CPImageViewAlignmentScaling|
+1769971485201|CPImageViewTest|
+1769971485214|CPImageViewbindingsTest|
+1769971485228|CPLevelIndicator|
+1769971485241|CPLocalizationTest|
+1769971485254|CPLogTest|
+1769971485268|CPMenuCALayerTest|
+1769971485281|CPMenuEnabledBindingsTest|
+1769971485294|CPMenuKeyEquivalents|
+1769971485308|CPMenuRemoveAllTest|
+1769971485321|CPMenuSubmenuPlacementConstraints|
+1769971485334|CPMenuTest|
+1769971485348|CPOutlineViewCibTest|
+1769971485361|CPOutlineViewTest|
+1769971485374|CPOutlineViewViewBasedCibTest|
+1769971485387|CPPanelTest|
+1769971485400|CPPlatformWindow|
+1769971485414|CPPlattformWindowMinSize|
+1769971485427|CPPopUpButtonBindings|
+1769971485440|CPPopUpButtonTest|
+1769971485454|CPPopover|
+1769971485467|CPPredicateEditorCibTest|
+1769971485480|CPProgressIndicator|
+1769971485494|CPPropertyListSerializationTest|
+1769971485507|CPRadioBindings|
+1769971485520|CPRuleEditorCibTest|
+1769971485534|CPScrollView|
+1769971485547|CPScrollView2|
+1769971485560|CPSearchField|
+1769971485573|CPSearchFieldPredicateBinding|
+1769971485587|CPSegmentedControlBindings|
+1769971485600|CPSegmentedControlTest|
+1769971485613|CPSoundTest|
+1769971485626|CPSplitViewDivider|
+1769971485640|CPSplitViewTest|
+1769971485653|CPStackViewTest|
+1769971485666|CPStepperBindings|
+1769971485680|CPStepperNibTest|
+1769971485693|CPTabView2|
+1769971485706|CPTabViewBindings|
+1769971485719|CPTabViewNib|
+1769971485733|CPTableViewGroupRows|
+1769971485746|CPTextField|
+1769971485759|CPTextFieldEditingStyleTest|
+1769971485772|CPTextFieldHeightTest|
+1769971485786|CPTextFieldMovementsTest|
+1769971485799|CPTextFieldMultiline|
+1769971485812|CPTextView|
+1769971485825|CPTextViewCibTest|
+1769971485839|CPTextViewDelegateAndNotifications|
+1769971485852|CPTimeZone|
+1769971485865|CPTokenFieldTest|
+1769971485879|CPToolTip|
+1769971485892|CPToolbarTest|
+1769971485905|CPURLConnectionAsyncTest|
+1769971485918|CPURLConnectionSynchronousTest|
+1769971485932|CPUserDefaults|
+1769971485945|CPUserDefaultsControllerTest|
+1769971485958|CPUserNotificationTest|
+1769971485972|CPViewController|
+1769971485985|CPVisualEffectViewTest|
+1769971485998|CPWebViewTest|
+1769971486011|CPWebViewTest2|
+1769971486025|CPWindowLiveResizeTest|
+1769971486038|CPWindowMovableTest|
+1769971486051|CPWindowResizeStyle|
+1769971486065|ChildWindows|
+1769971486078|CompilationTests|
+1769971486091|ContinuouslyUpdatesValueBinding|
+1769971486104|CopyAndPaste|
+1769971486118|CrossOriginTest|
+1769971486131|FF4096Test|
+1769971486144|FontEnhancementTest|
+1769971486158|FontMetricsExplorer|
+1769971486171|KeyEquivalents|
+1769971486184|KeyViewLoopTest|
+1769971486198|KeyWindowInTheBackgroundActivation|
+1769971486211|LayoutTest|
+1769971486224|LoadTimeTest|
+1769971486237|LongBindings|
+1769971486251|MobileTest|
+1769971486264|MultipleValueBindings|
+1769971486277|NSBoxTest|
+1769971486291|NSBrowserTest|
+1769971486304|NewTextFieldBezel|
+1769971486317|Nib2CibAlignment|
+1769971486331|Nib2CibBaselineAlignementTest|
+1769971486344|Nib2CibSubviewsOrderTest|
+1769971486357|NibAppRemixed|
+1769971486371|PatternFillTest|
+1769971486384|PlatformWindows|
+1769971486397|PopUpButtonEscTest|
+1769971486410|ScalingTest|
+1769971486424|ScalingTest2|
+1769971486437|ScrollviewTheming|
+1769971486450|SheetWindowOrderFrontIssue|
+1769971486464|SimpleBindings2|
+1769971486477|SmartFoldersDemo|
+1769971486490|TableTest|
+1769971486503|ThemeBrowser|
+1769971486517|ThemeKitchenSink|
+1769971486530|TrackingArea|
+1769971486543|UndoRedoWithMenuUpdate|
+1769971486556|UserlandNSTest|
+1769971486569|layoutEphemeralSubviewTest|
+1769971486583|loadDynamicFrameworks|
+1769971486596|performKeyEquivalentTest|
+1769971486609|predicateWithFormat|
+1769971486622|resignFirstResponder-CPControlTextDidEndEditing|
+1769971486636|sizeToFitFix|