Remove legacy pre-10.7 stuff

Fix #173

src/MacVim/DBPrefsWindowController.h

@@ -42,11 +42,8 @@
 #import <Cocoa/Cocoa.h>
 
 
-@interface DBPrefsWindowController : NSWindowController
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)
-    // 10.6 has turned delegate messages into formal protocols
-    <NSAnimationDelegate, NSToolbarDelegate>
-#endif
+@interface DBPrefsWindowController : NSWindowController<NSAnimationDelegate,
+    NSToolbarDelegate>
 {
 	NSMutableArray *toolbarIdentifiers;
 	NSMutableDictionary *toolbarViews;

src/MacVim/MMAppController.h

@@ -31,9 +31,7 @@
     NSMutableDictionary *inputQueues;
     int                 processingFlag;
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
     FSEventStreamRef    fsEventStream;
-#endif
 }
 
 + (MMAppController *)sharedInstance;

src/MacVim/MMAppController.m

@@ -45,10 +45,8 @@
 #import "Miscellaneous.h"
 #import <unistd.h>
 #import <CoreServices/CoreServices.h>
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
 // Need Carbon for TIS...() functions
 #import <Carbon/Carbon.h>
-#endif
 
 
 #define MM_HANDLE_XCODE_MOD_EVENT 0
@@ -61,12 +59,10 @@ static NSTimeInterval MMReplyTimeout = 5;
 
 static NSString *MMWebsiteString = @"https://macvim-dev.github.io/macvim/";
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
 // Latency (in s) between FS event occuring and being reported to MacVim.
 // Should be small so that MacVim is notified of changes to the ~/.vim
 // directory more or less immediately.
 static CFTimeInterval MMEventStreamLatency = 0.1;
-#endif
 
 static float MMCascadeHorizontalOffset = 21;
 static float MMCascadeVerticalOffset = 23;
@@ -143,14 +139,11 @@ typedef struct
 - (NSScreen *)screenContainingTopLeftPoint:(NSPoint)pt;
 - (void)addInputSourceChangedObserver;
 - (void)removeInputSourceChangedObserver;
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
 - (void)inputSourceChanged:(NSNotification *)notification;
-#endif
 @end
 
 
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
     static void
 fsEventCallback(ConstFSEventStreamRef streamRef,
                 void *clientCallBackInfo,
@@ -161,7 +154,6 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
 {
     [[MMAppController sharedInstance] handleFSEvent];
 }
-#endif
 
 @implementation MMAppController
 
@@ -207,10 +199,10 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
         [NSNumber numberWithInt:0],     MMOpenInCurrentWindowKey,
         [NSNumber numberWithBool:NO],   MMNoFontSubstitutionKey,
         [NSNumber numberWithBool:YES],  MMLoginShellKey,
-        [NSNumber numberWithInt:2],     MMRendererKey,
+        [NSNumber numberWithInt:MMRendererCoreText],
+                                        MMRendererKey,
         [NSNumber numberWithInt:MMUntitledWindowAlways],
                                         MMUntitledWindowKey,
-        [NSNumber numberWithBool:NO],   MMTexturedWindowKey,
         [NSNumber numberWithBool:NO],   MMZoomBothKey,
         @"",                            MMLoginShellCommandKey,
         @"",                            MMLoginShellArgumentKey,
@@ -547,9 +539,7 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
             [alert setMessageText:NSLocalizedString(
                     @"Are you sure you want to quit MacVim?",
                     @"Quit dialog with no changed buffers, title")];
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
             [alert setShowsSuppressionButton:YES];
-#endif
 
             NSString *info = nil;
             if (numWindows > 1) {
@@ -579,12 +569,10 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
             if ([alert runModal] != NSAlertFirstButtonReturn)
                 reply = NSTerminateCancel;
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
             if ([[alert suppressionButton] state] == NSOnState) {
                 [[NSUserDefaults standardUserDefaults]
                             setBool:YES forKey:MMSuppressTerminationAlertKey];
             }
-#endif
 
             [alert release];
         }
@@ -1081,10 +1069,6 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
     [panel setAllowsMultipleSelection:YES];
     [panel setCanChooseDirectories:YES];
     [panel setAccessoryView:showHiddenFilesView()];
-#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)
-    // NOTE: -[NSOpenPanel runModalForDirectory:file:types:] is deprecated on
-    // 10.7 but -[NSOpenPanel setDirectoryURL:] requires 10.6 so jump through
-    // the following hoops on 10.6+.
     dir = [dir stringByExpandingTildeInPath];
     if (dir) {
         NSURL *dirURL = [NSURL fileURLWithPath:dir isDirectory:YES];
@@ -1093,9 +1077,6 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
     }
 
     NSInteger result = [panel runModal];
-#else
-    NSInteger result = [panel runModalForDirectory:dir file:nil types:nil];
-#endif
 
 #if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_10)
     if (NSModalResponseOK == result) {
@@ -1197,18 +1178,14 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
     [NSApp makeWindowsPerform:@selector(performZoom:) inOrder:YES];
 }
 
-- (IBAction)atsuiButtonClicked:(id)sender
+- (IBAction)coreTextButtonClicked:(id)sender
 {
-    ASLogDebug(@"Toggle ATSUI renderer");
+    ASLogDebug(@"Toggle CoreText renderer");
     NSInteger renderer = MMRendererDefault;
     BOOL enable = ([sender state] == NSOnState);
 
     if (enable) {
-#if MM_ENABLE_ATSUI
-        renderer = MMRendererATSUI;
-#else
         renderer = MMRendererCoreText;
-#endif
     }
 
     // Update the user default MMRenderer and synchronize the change so that
@@ -1221,7 +1198,7 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
 
     ASLogInfo(@"Use renderer=%ld", renderer);
 
-    // This action is called when the user clicks the "use ATSUI renderer"
+    // This action is called when the user clicks the "use CoreText renderer"
     // button in the advanced preferences pane.
     [self rebuildPreloadCache];
 }
@@ -1999,13 +1976,6 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
     }
 }
 
-
-// HACK: fileAttributesAtPath was deprecated in 10.5
-#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
-#define MM_fileAttributes(fm,p) [fm attributesOfItemAtPath:p error:NULL]
-#else
-#define MM_fileAttributes(fm,p) [fm fileAttributesAtPath:p traverseLink:YES]
-#endif
 - (NSDate *)rcFilesModificationDate
 {
     // Check modification dates for ~/.vimrc and ~/.gvimrc and return the
@@ -2017,20 +1987,20 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
     NSFileManager *fm = [NSFileManager defaultManager];
 
     NSString *path = [@"~/.vimrc" stringByExpandingTildeInPath];
-    NSDictionary *attr = MM_fileAttributes(fm, path);
+    NSDictionary *attr = [fm attributesOfItemAtPath:path error:NULL];
     if (!attr) {
         path = [@"~/_vimrc" stringByExpandingTildeInPath];
-        attr = MM_fileAttributes(fm, path);
+        attr = [fm attributesOfItemAtPath:path error:NULL];
     }
     NSDate *modDate = [attr objectForKey:NSFileModificationDate];
     if (modDate)
         date = modDate;
 
     path = [@"~/.gvimrc" stringByExpandingTildeInPath];
-    attr = MM_fileAttributes(fm, path);
+    attr = [fm attributesOfItemAtPath:path error:NULL];
     if (!attr) {
         path = [@"~/_gvimrc" stringByExpandingTildeInPath];
-        attr = MM_fileAttributes(fm, path);
+        attr = [fm attributesOfItemAtPath:path error:NULL];
     }
     modDate = [attr objectForKey:NSFileModificationDate];
     if (modDate)
@@ -2038,7 +2008,6 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
 
     return date;
 }
-#undef MM_fileAttributes
 
 - (BOOL)openVimControllerWithArguments:(NSDictionary *)arguments
 {
@@ -2079,11 +2048,8 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
 
 - (void)startWatchingVimDir
 {
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
     if (fsEventStream)
         return;
-    if (NULL == &FSEventStreamStart)
-        return; // FSEvent functions are weakly linked
 
     NSString *path = [@"~/.vim" stringByExpandingTildeInPath];
     NSArray *pathsToWatch = [NSArray arrayWithObject:path];
@@ -2098,15 +2064,10 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
 
     FSEventStreamStart(fsEventStream);
     ASLogDebug(@"Started FS event stream");
-#endif
 }
 
 - (void)stopWatchingVimDir
 {
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
-    if (NULL == &FSEventStreamStop)
-        return; // FSEvent functions are weakly linked
-
     if (fsEventStream) {
         FSEventStreamStop(fsEventStream);
         FSEventStreamInvalidate(fsEventStream);
@@ -2114,8 +2075,6 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
         fsEventStream = NULL;
         ASLogDebug(@"Stopped FS event stream");
     }
-#endif
-
 }
 
 - (void)handleFSEvent
@@ -2493,36 +2452,21 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
 
 - (void)addInputSourceChangedObserver
 {
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
-    // The TIS symbols are weakly linked.
-    if (NULL != &TISCopyCurrentKeyboardInputSource) {
-        // We get here when compiled on >=10.5 and running on >=10.5.
-
-        id nc = [NSDistributedNotificationCenter defaultCenter];
-        NSString *notifyInputSourceChanged =
-            (NSString *)kTISNotifySelectedKeyboardInputSourceChanged;
-        [nc addObserver:self
-               selector:@selector(inputSourceChanged:)
-                   name:notifyInputSourceChanged
-                 object:nil];
-    }
-#endif
+    id nc = [NSDistributedNotificationCenter defaultCenter];
+    NSString *notifyInputSourceChanged =
+        (NSString *)kTISNotifySelectedKeyboardInputSourceChanged;
+    [nc addObserver:self
+           selector:@selector(inputSourceChanged:)
+               name:notifyInputSourceChanged
+             object:nil];
 }
 
 - (void)removeInputSourceChangedObserver
 {
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
-    // The TIS symbols are weakly linked.
-    if (NULL != &TISCopyCurrentKeyboardInputSource) {
-        // We get here when compiled on >=10.5 and running on >=10.5.
-
-        id nc = [NSDistributedNotificationCenter defaultCenter];
-        [nc removeObserver:self];
-    }
-#endif
+    id nc = [NSDistributedNotificationCenter defaultCenter];
+    [nc removeObserver:self];
 }
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
 - (void)inputSourceChanged:(NSNotification *)notification
 {
     unsigned i, count = [vimControllers count];
@@ -2533,6 +2477,5 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
         [tv checkImState];
     }
 }
-#endif
 
 @end // MMAppController (Private)

src/MacVim/MMApplication.m

@@ -15,15 +15,6 @@
 
 #import "MMApplication.h"
 
-// Ctrl-Tab is broken on pre 10.5, so we add a hack to make it work.
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
-# import "MMTextView.h"
-# define MM_CTRL_TAB_HACK 1
-#endif
-
-
-
-
 @implementation MMApplication
 
 - (void)sendEvent:(NSEvent *)event
@@ -31,19 +22,6 @@
     NSEventType type = [event type];
     unsigned flags = [event modifierFlags];
 
-#ifdef MM_CTRL_TAB_HACK
-    NSResponder *firstResponder = [[self keyWindow] firstResponder];
-
-    if (NSKeyDown == type && NSControlKeyMask & flags && 48 == [event keyCode]
-            && [firstResponder isKindOfClass:[MMTextView class]]) {
-        // HACK! This is a Ctrl-Tab key down event and the first responder is
-        // an MMTextView; send the event directly to the text view, else it
-        // will never receive it on pre 10.5 systems.
-        [firstResponder keyDown:event];
-        return;
-    }
-#endif
-
     // HACK! Intercept 'help' key presses and clear the 'help key flag', else
     // Cocoa turns the mouse cursor into a question mark and goes into 'context
     // help mode' (the keyDown: event itself never reaches the text view).  By
@@ -66,7 +44,6 @@
     [super sendEvent:event];
 }
 
-
 - (void)orderFrontStandardAboutPanel:(id)sender
 {
     NSString *version = [[NSBundle mainBundle] objectForInfoDictionaryKey:

src/MacVim/MMAtsuiTextView.h

@@ -1,108 +0,0 @@
-/* vi:set ts=8 sts=4 sw=4 ft=objc:
- *
- * VIM - Vi IMproved		by Bram Moolenaar
- *				MacVim GUI port by Bjorn Winckler
- *
- * Do ":help uganda"  in Vim to read copying and usage conditions.
- * Do ":help credits" in Vim to see a list of people who contributed.
- * See README.txt for an overview of the Vim source code.
- */
-
-
-#import <Cocoa/Cocoa.h>
-#import "Miscellaneous.h"
-
-#if MM_ENABLE_ATSUI
-
-enum { MMMaxCellsPerChar = 2 };
-
-@class MMTextViewHelper;
-
-
-@interface MMAtsuiTextView : NSView <NSTextInput> {
-    // From MMTextStorage
-    int                         maxRows, maxColumns;
-    NSColor                     *defaultBackgroundColor;
-    NSColor                     *defaultForegroundColor;
-    NSSize                      cellSize;
-    NSFont                      *font;
-    NSFont                      *fontWide;
-    float                       linespace;
-    float                       ascender;
-
-    // From NSTextView
-    NSSize                      insetSize;
-
-    // From vim-cocoa
-    NSImage                     *contentImage;
-    NSSize                      imageSize;
-    ATSUStyle                   atsuStyles[MMMaxCellsPerChar];
-    BOOL                        antialias;
-
-    MMTextViewHelper            *helper;
-}
-
-- (id)initWithFrame:(NSRect)frame;
-
-//
-// MMTextStorage methods
-//
-- (int)maxRows;
-- (int)maxColumns;
-- (void)getMaxRows:(int*)rows columns:(int*)cols;
-- (void)setMaxRows:(int)rows columns:(int)cols;
-- (void)setDefaultColorsBackground:(NSColor *)bgColor
-                        foreground:(NSColor *)fgColor;
-- (NSColor *)defaultBackgroundColor;
-- (NSColor *)defaultForegroundColor;
-- (NSRect)rectForRowsInRange:(NSRange)range;
-- (NSRect)rectForColumnsInRange:(NSRange)range;
-
-- (void)setFont:(NSFont *)newFont;
-- (void)setWideFont:(NSFont *)newFont;
-- (NSFont *)font;
-- (NSFont *)fontWide;
-- (NSSize)cellSize;
-- (void)setLinespace:(float)newLinespace;
-
-//
-// MMTextView methods
-//
-- (void)deleteSign:(NSString *)signName;
-- (void)setToolTipAtMousePoint:(NSString *)string;
-- (void)setPreEditRow:(int)row column:(int)col;
-- (void)setMouseShape:(int)shape;
-- (void)setAntialias:(BOOL)state;
-- (void)setLigatures:(BOOL)state;
-- (void)setImControl:(BOOL)enable;
-- (void)activateIm:(BOOL)enable;
-- (void)checkImState;
-- (BOOL)convertPoint:(NSPoint)point toRow:(int *)row column:(int *)column;
-- (NSPoint)pointForRow:(int)row column:(int)col;
-- (NSRect)rectForRow:(int)row column:(int)col numRows:(int)nr
-          numColumns:(int)nc;
-
-//
-// NSTextView methods
-//
-- (void)keyDown:(NSEvent *)event;
-- (void)insertText:(id)string;
-- (void)doCommandBySelector:(SEL)selector;
-- (BOOL)performKeyEquivalent:(NSEvent *)event;
-
-//
-// NSTextContainer methods
-//
-- (void)setTextContainerInset:(NSSize)inset;
-
-//
-// MMAtsuiTextView methods
-//
-- (void)performBatchDrawWithData:(NSData *)data;
-- (NSSize)desiredSize;
-- (NSSize)minSize;
-- (NSSize)constrainRows:(int *)rows columns:(int *)cols toSize:(NSSize)size;
-
-@end
-
-#endif // MM_ENABLE_ATSUI

src/MacVim/MMBackend.h

@@ -137,10 +137,7 @@ extern NSTimeInterval MMBalloonEvalInternalDelay;
 
 - (void)setAntialias:(BOOL)antialias;
 - (void)setLigatures:(BOOL)ligatures;
-
-#ifdef BLUR_TRANSPARENCY
 - (void)setBlurRadius:(int)radius;
-#endif
 
 - (void)updateModifiedFlag;
 

src/MacVim/MMBackend.m

@@ -196,9 +196,7 @@ extern GuiFont gui_mch_retain_font(GuiFont font);
 - (void)redrawScreen;
 - (void)handleFindReplace:(NSDictionary *)args;
 - (void)handleMarkedText:(NSData *)data;
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
 - (void)handleGesture:(NSData *)data;
-#endif
 #ifdef FEAT_BEVAL
 - (void)bevalCallback:(id)sender;
 #endif
@@ -1187,8 +1185,6 @@ extern GuiFont gui_mch_retain_font(GuiFont font);
     [self queueMessage:msgid data:nil];
 }
 
-#ifdef BLUR_TRANSPARENCY
-
 - (void)setBlurRadius:(int)radius
 {
     NSMutableData *data = [NSMutableData data];
@@ -1197,8 +1193,6 @@ extern GuiFont gui_mch_retain_font(GuiFont font);
     [self queueMessage:SetBlurRadiusMsgID data:data];
 }
 
-#endif
-
 - (void)updateModifiedFlag
 {
     int state = [self checkForModifiedBuffers];
@@ -2107,9 +2101,7 @@ static void netbeansReadCallback(CFSocketRef s,
         winposY = *((int*)bytes);  bytes += sizeof(int);
         ASLogDebug(@"SetWindowPositionMsgID: x=%d y=%d", winposX, winposY);
     } else if (GestureMsgID == msgid) {
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
         [self handleGesture:data];
-#endif
     } else if (ActivatedImMsgID == msgid) {
         [self setImState:YES];
     } else if (DeactivatedImMsgID == msgid) {
@@ -3004,7 +2996,6 @@ static void netbeansReadCallback(CFSocketRef s,
     }
 }
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
 - (void)handleGesture:(NSData *)data
 {
     const void *bytes = [data bytes];
@@ -3032,7 +3023,6 @@ static void netbeansReadCallback(CFSocketRef s,
         add_to_input_buf(string, 6);
     }
 }
-#endif
 
 #ifdef FEAT_BEVAL
 - (void)bevalCallback:(id)sender

src/MacVim/MMCoreTextView+ToolTip.m

@@ -19,10 +19,6 @@
  * changes were made to adapt the code to MacVim.
  */
 
-#import "Miscellaneous.h" // Defines MM_ENABLE_ATSUI
-
-#if !MM_ENABLE_ATSUI
-
 #import "MMCoreTextView.h"
 
 
@@ -232,5 +228,3 @@ static const NSTrackingRectTag kTrackingRectTag = 0xBADFACE;
 }
 
 @end
-
-#endif // !MM_ENABLE_ATSUI

src/MacVim/MMCoreTextView.h

@@ -9,9 +9,6 @@
  */
 
 #import <Cocoa/Cocoa.h>
-#import "Miscellaneous.h" // Defines MM_ENABLE_ATSUI
-
-#if !MM_ENABLE_ATSUI
 
 @class MMTextViewHelper;
 
@@ -93,7 +90,6 @@
 - (void)keyDown:(NSEvent *)event;
 - (void)insertText:(id)string;
 - (void)doCommandBySelector:(SEL)selector;
-- (BOOL)performKeyEquivalent:(NSEvent *)event;
 
 //
 // NSTextContainer methods
@@ -116,5 +112,3 @@
 @interface MMCoreTextView (ToolTip)
 - (void)setToolTipAtMousePoint:(NSString *)string;
 @end
-
-#endif // !MM_ENABLE_ATSUI

src/MacVim/MMCoreTextView.m

@@ -25,10 +25,7 @@
  * resized.
  */
 
-#import "Miscellaneous.h" // Defines MM_ENABLE_ATSUI
-
-#if !MM_ENABLE_ATSUI
-
+#import "Miscellaneous.h"
 #import "MMAppController.h"
 #import "MMCoreTextView.h"
 #import "MMTextViewHelper.h"
@@ -423,11 +420,6 @@ defaultAdvanceForFont(NSFont *font)
     [helper doCommandBySelector:selector];
 }
 
-- (BOOL)performKeyEquivalent:(NSEvent *)event
-{
-    return [helper performKeyEquivalent:event];
-}
-
 - (BOOL)hasMarkedText
 {
     return [helper hasMarkedText];
@@ -513,13 +505,10 @@ defaultAdvanceForFont(NSFont *font)
     [helper mouseMoved:event];
 }
 
-// Gesture event are new for OS X 10.6
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
 - (void)swipeWithEvent:(NSEvent *)event
 {
     [helper swipeWithEvent:event];
 }
-#endif
 
 - (NSMenu*)menuForEvent:(NSEvent *)event
 {
@@ -1523,5 +1512,3 @@ recurseDraw(const unichar *chars, CGGlyph *glyphs, CGPoint *positions,
 }
 
 @end // MMCoreTextView (Drawing)
-
-#endif // !MM_ENABLE_ATSUI

src/MacVim/MMFullScreenWindow.m

@@ -189,23 +189,19 @@ enum {
     // dimensions when exiting full-screen.
     startFuFlags = options;
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
     // HACK! Put window on all Spaces to avoid Spaces (available on OS X 10.5
     // and later) from moving the full-screen window to a separate Space from
     // the one the decorated window is occupying.  The collection behavior is
     // restored further down.
     NSWindowCollectionBehavior wcb = [self collectionBehavior];
     [self setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces];
-#endif
 
     // make us visible and target invisible
     [target orderOut:self];
     [self makeKeyAndOrderFront:self];
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
     // Restore collection behavior (see hack above).
     [self setCollectionBehavior:wcb];
-#endif
 
     // fade back in
     if (didBlend) {
@@ -281,7 +277,6 @@ enum {
     // button on the tabline steals the first responder status.
     [target setInitialFirstResponder:[view textView]];
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
     // HACK! Put decorated window on all Spaces (available on OS X 10.5 and
     // later) so that the decorated window stays on the same Space as the full
     // screen window (they may occupy different Spaces e.g. if the full-screen
@@ -289,7 +284,7 @@ enum {
     // restored further down.
     NSWindowCollectionBehavior wcb = [target collectionBehavior];
     [target setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces];
-#endif
+
 #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
     // HACK! On Mac OS X 10.7 windows animate when makeKeyAndOrderFront: is
     // called.  This is distracting here, so disable the animation and restore
@@ -308,10 +303,9 @@ enum {
     if (NSWindowAnimationBehaviorNone != a)
         [target setAnimationBehavior:a];
 #endif
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+
     // Restore collection behavior (see hack above).
     [target setCollectionBehavior:wcb];
-#endif
 
     // ...but we don't want a focus gained message either, so don't set this
     // sooner

src/MacVim/MMTextView.m

@@ -685,11 +685,6 @@
     [helper doCommandBySelector:selector];
 }
 
-- (BOOL)performKeyEquivalent:(NSEvent *)event
-{
-    return [helper performKeyEquivalent:event];
-}
-
 - (BOOL)hasMarkedText
 {
     return [helper hasMarkedText];
@@ -780,13 +775,10 @@
     [helper mouseMoved:event];
 }
 
-// Gesture event are new for OS X 10.6
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
 - (void)swipeWithEvent:(NSEvent *)event
 {
     [helper swipeWithEvent:event];
 }
-#endif
 
 - (NSMenu*)menuForEvent:(NSEvent *)event
 {

src/MacVim/MMTextViewHelper.h

@@ -10,10 +10,8 @@
 
 #import <Cocoa/Cocoa.h>
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
 // Need Carbon for TIS...() functions
 #import <Carbon/Carbon.h>
-#endif
 
 
 #define BLUE(argb)      ((argb & 0xff)/255.0f)
@@ -47,10 +45,8 @@
     int                 preEditColumn;
     BOOL                imControl;
     BOOL                imState;
-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
     TISInputSourceRef   lastImSource;
     TISInputSourceRef   asciiImSource;
-#endif
 }
 
 - (id)init;
@@ -61,15 +57,12 @@
 - (void)keyDown:(NSEvent *)event;
 - (void)insertText:(id)string;
 - (void)doCommandBySelector:(SEL)selector;
-- (BOOL)performKeyEquivalent:(NSEvent *)event;
 - (void)scrollWheel:(NSEvent *)event;
 - (void)mouseDown:(NSEvent *)event;
 - (void)mouseUp:(NSEvent *)event;
 - (void)mouseDragged:(NSEvent *)event;
 - (void)mouseMoved:(NSEvent *)event;
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
 - (void)swipeWithEvent:(NSEvent *)event;
-#endif
 - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender;
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender;
 - (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender;
@@ -96,8 +89,6 @@
 - (void)setImControl:(BOOL)enable;
 - (void)activateIm:(BOOL)enable;
 - (BOOL)useInlineIm;
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
 - (void)checkImState;
-#endif
 
 @end

src/MacVim/MMTextViewHelper.m

@@ -12,7 +12,7 @@
  *
  * Contains code shared between the different text renderers.  Unfortunately it
  * is not possible to let the text renderers inherit from this class since
- * MMTextView needs to inherit from NSTextView whereas MMAtsuiTextView needs to
+ * MMTextView needs to inherit from NSTextView whereas MMCoreTextView needs to
  * inherit from NSView.
  */
 
@@ -36,7 +36,6 @@ static float MMDragAreaSize = 73.0f;
 - (MMVimController *)vimController;
 - (void)doKeyDown:(NSString *)key;
 - (void)doInsertText:(NSString *)text;
-- (void)pollImState;
 - (void)hideMouseCursor;
 - (void)startDragTimerWithInterval:(NSTimeInterval)t;
 - (void)dragTimerFired:(NSTimer *)timer;
@@ -45,15 +44,12 @@ static float MMDragAreaSize = 73.0f;
 - (BOOL)inputManagerHandleMouseEvent:(NSEvent *)event;
 - (void)sendMarkedText:(NSString *)text position:(int32_t)pos;
 - (void)abandonMarkedText;
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
 - (void)sendGestureEvent:(int)gesture flags:(int)flags;
-#endif
 @end
 
 
 
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
     static BOOL
 KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
 {
@@ -68,7 +64,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
 
     return [as isEqualToString:bs];
 }
-#endif
 
 
 @implementation MMTextViewHelper
@@ -98,7 +93,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
     [signImages release];  signImages = nil;
     [mouseDownTime release];  mouseDownTime = nil;
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
     if (asciiImSource) {
         CFRelease(asciiImSource);
         asciiImSource = NULL;
@@ -107,7 +101,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
         CFRelease(lastImSource);
         lastImSource = NULL;
     }
-#endif
 
     [super dealloc];
 }
@@ -135,20 +128,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
 {
     ASLogDebug(@"%@", event);
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
-    if (NULL == &TISCopyCurrentKeyboardInputSource) {
-#endif
-
-        // NOTE: Check IM state _before_ key has been interpreted or we'll pick
-        // up the old IM state when it has been switched via a keyboard shortcut
-        // that MacVim cannot handle.
-        if (imControl)
-            [self pollImState];
-
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
-    }
-#endif
-
     // NOTE: Keyboard handling is complicated by the fact that we must call
     // interpretKeyEvents: otherwise key equivalents set up by input methods do
     // not work (e.g. Ctrl-Shift-; would not work under Kotoeri).
@@ -298,47 +277,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
     else interpretKeyEventsSwallowedKey = NO;
 }
 
-- (BOOL)performKeyEquivalent:(NSEvent *)event
-{
-    ASLogDebug(@"");
-    if ([event type] != NSKeyDown)
-        return NO;
-
-    // NOTE: Key equivalent handling was fixed in Leopard.  That is, an
-    // unhandled key equivalent is passed to keyDown: -- contrast this with
-    // pre-Leopard where unhandled key equivalents would simply disappear
-    // (hence the ugly hack below for Tiger).
-    if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4)
-        return NO;
-
-    // HACK! KeyCode 50 represent the key which switches between windows
-    // within an application (like Cmd+Tab is used to switch between
-    // applications).  Return NO here, else the window switching does not work.
-    if ([event keyCode] == 50)
-        return NO;
-
-    // HACK! The -[NSRespoder cancelOperation:] indicates that Cmd-. is handled
-    // in a special way by the key window.  Indeed, if we pass this event on to
-    // keyDown: it will result in doCommandBySelector: being called with
-    // cancelOperation: as selector, otherwise it is called with cancel: as the
-    // selector (and we respond to cancel: there).
-    int flags = [event modifierFlags] & NSDeviceIndependentModifierFlagsMask;
-    NSString *unmod = [event charactersIgnoringModifiers];
-    if (flags == NSCommandKeyMask && [unmod isEqual:@"."])
-        return NO;
-
-    // HACK! Let the main menu try to handle any key down event, before
-    // passing it on to vim, otherwise key equivalents for menus will
-    // effectively be disabled.
-    if ([[NSApp mainMenu] performKeyEquivalent:event])
-        return YES;
-
-    // HACK! Pass the event on or it may disappear (Tiger does not pass Cmd-key
-    // events to keyDown:).
-    [self keyDown:event];
-    return YES;
-}
-
 - (void)scrollWheel:(NSEvent *)event
 {
     if ([self hasMarkedText]) {
@@ -346,11 +284,7 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
         // marked text moves outside the view as a result of scrolling.
         [self sendMarkedText:nil position:0];
         [self unmarkText];
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
         [[NSTextInputContext currentInputContext] discardMarkedText];
-#else
-        [[NSInputManager currentInputManager] markedTextAbandoned:self];
-#endif
     }
 
     float dx = [event deltaX];
@@ -501,7 +435,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
     [[self vimController] sendMessage:MouseMovedMsgID data:data];
 }
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
 - (void)swipeWithEvent:(NSEvent *)event
 {
     CGFloat dx = [event deltaX];
@@ -515,7 +448,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
 
     [self sendGestureEvent:type flags:[event modifierFlags]];
 }
-#endif
 
 - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
 {
@@ -810,31 +742,24 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
 {
     // This flag corresponds to the (negation of the) 'imd' option.  When
     // enabled changes to the input method are detected and forwarded to the
-    // backend.  On >=10.5 and later we do not forward changes to the input
-    // method, instead we let Vim be in complete control.
+    // backend. We do not forward changes to the input method, instead we let
+    // Vim be in complete control.
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
-    // The TIS symbols are weakly linked.
-    if (NULL != &TISCopyCurrentKeyboardInputSource) {
-        // We get here when compiled on >=10.5 and running on >=10.5.
-
-        if (asciiImSource) {
-            CFRelease(asciiImSource);
-            asciiImSource = NULL;
-        }
-        if (lastImSource) {
-            CFRelease(lastImSource);
-            lastImSource = NULL;
-        }
-        if (enable) {
-            // Save current locale input source for use when IM is active and
-            // get an ASCII source for use when IM is deactivated (by Vim).
-            asciiImSource = TISCopyCurrentASCIICapableKeyboardInputSource();
-            NSString *locale = [[NSLocale currentLocale] localeIdentifier];
-            lastImSource = TISCopyInputSourceForLanguage((CFStringRef)locale);
-        }
+    if (asciiImSource) {
+        CFRelease(asciiImSource);
+        asciiImSource = NULL;
+    }
+    if (lastImSource) {
+        CFRelease(lastImSource);
+        lastImSource = NULL;
+    }
+    if (enable) {
+        // Save current locale input source for use when IM is active and
+        // get an ASCII source for use when IM is deactivated (by Vim).
+        asciiImSource = TISCopyCurrentASCIICapableKeyboardInputSource();
+        NSString *locale = [[NSLocale currentLocale] localeIdentifier];
+        lastImSource = TISCopyInputSourceForLanguage((CFStringRef)locale);
     }
-#endif
 
     imControl = enable;
     ASLogDebug(@"IM control %sabled", enable ? "en" : "dis");
@@ -850,31 +775,14 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
 
     imState = enable;
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
-    // The TIS symbols are weakly linked.
-    if (NULL != &TISCopyCurrentKeyboardInputSource) {
-        // We get here when compiled on >=10.5 and running on >=10.5.
-
-        // Enable IM: switch back to input source used when IM was last on
-        // Disable IM: switch back to ASCII input source (set in setImControl:)
-        TISInputSourceRef ref = enable ? lastImSource : asciiImSource;
-        if (ref) {
-            ASLogDebug(@"Change input source: %@",
-                    TISGetInputSourceProperty(ref, kTISPropertyInputSourceID));
-            TISSelectInputSource(ref);
-        }
-
-        return;
+    // Enable IM: switch back to input source used when IM was last on
+    // Disable IM: switch back to ASCII input source (set in setImControl:)
+    TISInputSourceRef ref = enable ? lastImSource : asciiImSource;
+    if (ref) {
+        ASLogDebug(@"Change input source: %@",
+                TISGetInputSourceProperty(ref, kTISPropertyInputSourceID));
+        TISSelectInputSource(ref);
     }
-
-    // We get here when compiled on >=10.5 but running on 10.4 -- fall through
-    // and use old IM code...
-#endif
-#if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5)
-    // NOTE: The IM code is delegated to the frontend since calling it in
-    // the backend caused weird bugs (second dock icon appearing etc.).
-    KeyScript(enable ? smKeySysScript : smKeyRoman);
-#endif
 }
 
 - (BOOL)useInlineIm
@@ -889,9 +797,7 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
 
 - (void)checkImState
 {
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
-    if (imControl && NULL != &TISCopyCurrentKeyboardInputSource) {
-        // We get here when compiled on >=10.5 and running on >=10.5.
+    if (imControl) {
         TISInputSourceRef cur = TISCopyCurrentKeyboardInputSource();
         BOOL state = !KeyboardInputSourcesEqual(asciiImSource, cur);
         BOOL isChanged = !KeyboardInputSourcesEqual(lastImSource, cur);
@@ -912,7 +818,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
         }
         return;
     }
-#endif
 }
 
 @end // MMTextViewHelper
@@ -1000,28 +905,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
     [[self vimController] sendMessage:KeyDownMsgID data:data];
 }
 
-- (void)pollImState
-{
-#if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5)
-    // Compiled for <=10.4, running on 10.4
-
-    // IM is active whenever the current script is the system script and the
-    // system script isn't roman.  (Hence IM can only be active when using
-    // non-roman scripts.)
-
-    // NOTE: The IM code is delegated to the frontend since calling it in the
-    // backend caused weird bugs (second dock icon appearing etc.).
-    SInt32 currentScript = GetScriptManagerVariable(smKeyScript);
-    SInt32 systemScript = GetScriptManagerVariable(smSysScript);
-    BOOL state = currentScript != smRoman && currentScript == systemScript;
-    if (imState != state) {
-        imState = state;
-        int msgid = state ? ActivatedImMsgID : DeactivatedImMsgID;
-        [[self vimController] sendMessage:msgid data:nil];
-    }
-#endif
-}
-
 - (void)hideMouseCursor
 {
     // Check 'mousehide' option
@@ -1145,13 +1028,7 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
     // the Kotoeri manager "commits" the text on left clicks).
 
     if (event) {
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
         return [[NSTextInputContext currentInputContext] handleEvent:event];
-#else
-        NSInputManager *imgr = [NSInputManager currentInputManager];
-        if ([imgr wantsToHandleMouseEvents])
-            return [imgr handleMouseEvent:event];
-#endif
     }
 
     return NO;
@@ -1184,14 +1061,9 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
     // that the marked text should be abandoned.  (If pos is set to 0 Vim will
     // send backspace sequences to delete the old marked text.)
     [self sendMarkedText:nil position:-1];
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
     [[NSTextInputContext currentInputContext] discardMarkedText];
-#else
-    [[NSInputManager currentInputManager] markedTextAbandoned:self];
-#endif
 }
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
 - (void)sendGestureEvent:(int)gesture flags:(int)flags
 {
     NSMutableData *data = [NSMutableData data];
@@ -1201,6 +1073,5 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
 
     [[self vimController] sendMessage:GestureMsgID data:data];
 }
-#endif
 
 @end // MMTextViewHelper (Private)

src/MacVim/MMVimController.h

@@ -15,11 +15,8 @@
 
 
 
-@interface MMVimController : NSObject
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
-    // 10.6 has turned delegate messages into formal protocols
-    <NSToolbarDelegate, NSOpenSavePanelDelegate>
-#endif
+@interface MMVimController : NSObject<NSToolbarDelegate,
+    NSOpenSavePanelDelegate>
 {
     unsigned            identifier;
     BOOL                isInitialized;

src/MacVim/MMVimController.m

@@ -35,7 +35,6 @@
 #import "Miscellaneous.h"
 #import "MMCoreTextView.h"
 #import "MMWindow.h"
-#import "blur.h"
 
 
 static NSString *MMDefaultToolbarImageName = @"Attention";
@@ -885,12 +884,10 @@ static BOOL isUnsafeMessage(int msgid);
         if (filenames)
             [[NSDocumentController sharedDocumentController]
                                             noteNewRecentFilePaths:filenames];
-#ifdef BLUR_TRANSPARENCY
     } else if (SetBlurRadiusMsgID == msgid) {
         const void *bytes = [data bytes];
         int radius = *((int*)bytes);
         [windowController setBlurRadius:radius];
-#endif
 
     // IMPORTANT: When adding a new message, make sure to update
     // isUnsafeMessage() if necessary!
@@ -1404,11 +1401,8 @@ static BOOL isUnsafeMessage(int msgid);
             dir = [vimState objectForKey:@"pwd"];
     }
 
-#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)
-    // 10.6+ APIs uses URLs instead of paths
     dir = [dir stringByExpandingTildeInPath];
     NSURL *dirURL = dir ? [NSURL fileURLWithPath:dir isDirectory:YES] : nil;
-#endif
 
     if (saving) {
         NSSavePanel *panel = [NSSavePanel savePanel];
@@ -1419,10 +1413,6 @@ static BOOL isUnsafeMessage(int msgid);
         [panel setDelegate:self];
         if ([panel isExpanded])
             [panel setAccessoryView:showHiddenFilesView()];
-#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)
-        // NOTE: -[NSSavePanel beginSheetForDirectory::::::] is deprecated on
-        // 10.6 but -[NSSavePanel setDirectoryURL:] requires 10.6 so jump
-        // through the following hoops on 10.6+.
         if (dirURL)
             [panel setDirectoryURL:dirURL];
 
@@ -1430,13 +1420,6 @@ static BOOL isUnsafeMessage(int msgid);
                       completionHandler:^(NSInteger result) {
             [self savePanelDidEnd:panel code:result context:nil];
         }];
-#else
-        [panel beginSheetForDirectory:dir file:nil
-                modalForWindow:[windowController window]
-                 modalDelegate:self
-                didEndSelector:@selector(savePanelDidEnd:code:context:)
-                   contextInfo:NULL];
-#endif
     } else {
         NSOpenPanel *panel = [NSOpenPanel openPanel];
         [panel setAllowsMultipleSelection:NO];
@@ -1447,10 +1430,6 @@ static BOOL isUnsafeMessage(int msgid);
             [panel setCanChooseFiles:NO];
         }
 
-#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)
-        // NOTE: -[NSOpenPanel beginSheetForDirectory:::::::] is deprecated on
-        // 10.6 but -[NSOpenPanel setDirectoryURL:] requires 10.6 so jump
-        // through the following hoops on 10.6+.
         if (dirURL)
             [panel setDirectoryURL:dirURL];
 
@@ -1458,13 +1437,6 @@ static BOOL isUnsafeMessage(int msgid);
                       completionHandler:^(NSInteger result) {
             [self savePanelDidEnd:panel code:result context:nil];
         }];
-#else
-        [panel beginSheetForDirectory:dir file:nil types:nil
-                modalForWindow:[windowController window]
-                 modalDelegate:self
-                didEndSelector:@selector(savePanelDidEnd:code:context:)
-                   contextInfo:NULL];
-#endif
     }
 }
 

src/MacVim/MMVimView.m

@@ -18,13 +18,8 @@
  * the view is filled by the text view.
  */
 
-#import "Miscellaneous.h"   // Defines MM_ENABLE_ATSUI
-
-#if MM_ENABLE_ATSUI
-# import "MMAtsuiTextView.h"
-#else
-# import "MMCoreTextView.h"
-#endif
+#import "Miscellaneous.h"
+#import "MMCoreTextView.h"
 #import "MMTextView.h"
 #import "MMVimController.h"
 #import "MMVimView.h"
@@ -97,20 +92,11 @@ enum {
     NSInteger renderer = [ud integerForKey:MMRendererKey];
     ASLogInfo(@"Use renderer=%ld", renderer);
 
-#if MM_ENABLE_ATSUI
-    if (MMRendererATSUI == renderer) {
-        // HACK! 'textView' has type MMTextView, but MMAtsuiTextView is not
-        // derived from MMTextView.
-        textView = [[MMAtsuiTextView alloc] initWithFrame:frame];
-    }
-#else
     if (MMRendererCoreText == renderer) {
         // HACK! 'textView' has type MMTextView, but MMCoreTextView is not
         // derived from MMTextView.
         textView = (MMTextView *)[[MMCoreTextView alloc] initWithFrame:frame];
-    }
-#endif
-    else {
+    } else {
         // Use Cocoa text system for text rendering.
         textView = [[MMTextView alloc] initWithFrame:frame];
     }
@@ -175,7 +161,7 @@ enum {
 
     // HACK! The text storage is the principal owner of the text system, but we
     // keep only a reference to the text view, so release the text storage
-    // first (unless we are using the ATSUI renderer).
+    // first (unless we are using the CoreText renderer).
     if ([textView isKindOfClass:[MMTextView class]])
         [[textView textStorage] release];
 
@@ -454,12 +440,8 @@ enum {
                     identifier:(int32_t)ident
 {
     MMScroller *scroller = [self scrollbarForIdentifier:ident index:NULL];
-#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
     [scroller setDoubleValue:val];
     [scroller setKnobProportion:prop];
-#else
-    [scroller setFloatValue:val knobProportion:prop];
-#endif
     [scroller setEnabled:prop != 1.f];
 }
 

src/MacVim/MMWindow.h

@@ -9,7 +9,6 @@
  */
 
 #import "MacVim.h"
-#import "blur.h"
 
 
 
@@ -29,9 +28,7 @@
 - (void)setContentMinSize:(NSSize)size;
 - (void)setContentMaxSize:(NSSize)size;
 - (void)setContentSize:(NSSize)size;
-#ifdef BLUR_TRANSPARENCY
 - (void)setBlurRadius:(int)radius;
-#endif
 
 - (IBAction)toggleFullScreen:(id)sender;
 - (IBAction)realToggleFullScreen:(id)sender;

src/MacVim/MMWindow.m

@@ -29,9 +29,6 @@
 #import "MMWindow.h"
 #import "Miscellaneous.h"
 
-
-#ifdef BLUR_TRANSPARENCY
-
 #import "CGSInternal/CGSWindow.h"
 
 typedef CGError CGSSetWindowBackgroundBlurRadiusFunction(CGSConnectionID cid, CGSWindowID wid, NSUInteger blur);
@@ -62,9 +59,6 @@ static CGSSetWindowBackgroundBlurRadiusFunction* GetCGSSetWindowBackgroundBlurRa
     return function;
 }
 
-#endif // BLUR_TRANSPARENCY
-
-
 
 @implementation MMWindow
 
@@ -167,8 +161,6 @@ static CGSSetWindowBackgroundBlurRadiusFunction* GetCGSSetWindowBackgroundBlurRa
     [super setContentSize:size];
 }
 
-#ifdef BLUR_TRANSPARENCY
-
 - (void)setBlurRadius:(int)radius
 {
     if (radius >= 0) {
@@ -183,8 +175,6 @@ static CGSSetWindowBackgroundBlurRadiusFunction* GetCGSSetWindowBackgroundBlurRa
     }
 }
 
-#endif // BLUR_TRANSPARENCY
-
 - (void)performClose:(id)sender
 {
     id wc = [self windowController];

src/MacVim/MMWindowController.h

@@ -9,7 +9,6 @@
  */
 
 #import "MacVim.h"
-#import "blur.h"
 
 
 
@@ -18,11 +17,7 @@
 @class MMVimController;
 @class MMVimView;
 
-@interface MMWindowController : NSWindowController
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
-    // 10.6 has turned delegate messages into formal protocols
-    <NSWindowDelegate>
-#endif
+@interface MMWindowController : NSWindowController<NSWindowDelegate>
 {
     MMVimController     *vimController;
     MMVimView           *vimView;
@@ -47,9 +42,7 @@
     NSPoint             defaultTopLeft;
     NSToolbar           *toolbar;
     BOOL                resizingDueToMove;
-#ifdef BLUR_TRANSPARENCY
     int                 blurRadius;
-#endif
 }
 
 - (id)initWithVimController:(MMVimController *)controller;
@@ -86,9 +79,7 @@
 - (void)liveResizeWillStart;
 - (void)liveResizeDidEnd;
 
-#ifdef BLUR_TRANSPARENCY
 - (void)setBlurRadius:(int)radius;
-#endif
 
 - (void)enterFullScreen:(int)fuoptions backgroundColor:(NSColor *)back;
 - (void)leaveFullScreen;

src/MacVim/MMWindowController.m

@@ -62,7 +62,6 @@
  */
 
 #import "MMAppController.h"
-#import "MMAtsuiTextView.h"
 #import "MMFindReplaceController.h"
 #import "MMFullScreenWindow.h"
 #import "MMTextView.h"
@@ -128,7 +127,8 @@
 {
     unsigned styleMask = NSTitledWindowMask | NSClosableWindowMask
             | NSMiniaturizableWindowMask | NSResizableWindowMask
-            | NSUnifiedTitleAndToolbarWindowMask;
+            | NSUnifiedTitleAndToolbarWindowMask
+            | NSTexturedBackgroundWindowMask;
 
     if ([[NSUserDefaults standardUserDefaults]
             boolForKey:MMNoTitleBarWindowKey]) {
@@ -136,12 +136,6 @@
         styleMask &= ~NSTitledWindowMask;
     }
 
-    // Use textured background on Leopard or later (skip the 'if' on Tiger for
-    // polished metal window).
-    if ([[NSUserDefaults standardUserDefaults] boolForKey:MMTexturedWindowKey]
-            || (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4))
-        styleMask |= NSTexturedBackgroundWindowMask;
-
     // NOTE: The content rect is only used the very first time MacVim is
     // started (or rather, when ~/Library/Preferences/org.vim.MacVim.plist does
     // not exist).  The chosen values will put the window somewhere near the
@@ -336,9 +330,7 @@
     if (fullScreenEnabled && !fullScreenWindow)
         [decoratedWindow setAlphaValue:0];
 
-#ifdef BLUR_TRANSPARENCY
     [decoratedWindow setBlurRadius:blurRadius];
-#endif
 
     // Flag that the window is now placed on screen.  From now on it is OK for
     // code to depend on the screen state.  (Such as constraining views etc.)
@@ -729,7 +721,6 @@
     }
 }
 
-#ifdef BLUR_TRANSPARENCY
 - (void)setBlurRadius:(int)radius
 {
     blurRadius = radius;
@@ -737,7 +728,6 @@
         [decoratedWindow setBlurRadius:radius];
     }
 }
-#endif
 
 - (void)enterFullScreen:(int)fuoptions backgroundColor:(NSColor *)back
 {

src/MacVim/MacVim.h

@@ -13,15 +13,6 @@
 
 
 // Taken from /usr/include/AvailabilityMacros.h
-#ifndef MAC_OS_X_VERSION_10_4
-# define MAC_OS_X_VERSION_10_4 1040
-#endif
-#ifndef MAC_OS_X_VERSION_10_5
-# define MAC_OS_X_VERSION_10_5 1050
-#endif
-#ifndef MAC_OS_X_VERSION_10_6
-# define MAC_OS_X_VERSION_10_6 1060
-#endif
 #ifndef MAC_OS_X_VERSION_10_7
 # define MAC_OS_X_VERSION_10_7 1070
 #endif
@@ -34,16 +25,16 @@
 #ifndef MAC_OS_X_VERSION_10_10
 # define MAC_OS_X_VERSION_10_10 101000
 #endif
-#ifndef MAC_OS_X_VERSION_10_10_2
-# define MAC_OS_X_VERSION_10_10_2 101002
-#endif
-#ifndef MAC_OS_X_VERSION_10_10_3
-# define MAC_OS_X_VERSION_10_10_3 101003
-#endif
 #ifndef MAC_OS_X_VERSION_10_11
 # define MAC_OS_X_VERSION_10_11 101100
 #endif
 
+// Needed for pre-10.11 SDK
+#ifndef NSAppKitVersionNumber10_10_Max
+# define NSAppKitVersionNumber10_10_Max 1349
+#endif
+
+
 //
 // This is the protocol MMBackend implements.
 //
@@ -282,7 +273,6 @@ extern NSString *MMRendererKey;
 
 enum {
     MMRendererDefault = 0,
-    MMRendererATSUI,
     MMRendererCoreText
 };
 
@@ -332,41 +322,6 @@ extern NSString *VimFindPboardType;
 #define keyMMUntitledWindow       'MMuw'
 
 
-
-
-#ifndef NSINTEGER_DEFINED
-// NSInteger was introduced in 10.5
-# if __LP64__ || NS_BUILD_32_LIKE_64
-typedef long NSInteger;
-typedef unsigned long NSUInteger;
-# else
-typedef int NSInteger;
-typedef unsigned int NSUInteger;
-# endif
-# define NSINTEGER_DEFINED 1
-#endif
-
-// Needed for pre-10.5 SDK
-#ifndef NSAppKitVersionNumber10_4
-# define NSAppKitVersionNumber10_4 824
-#endif
-#ifndef NSAppKitVersionNumber10_10_Max
-# define NSAppKitVersionNumber10_10_Max 1349
-#endif
-
-#ifndef CGFLOAT_DEFINED
-    // On Leopard, CGFloat is float on 32bit and double on 64bit. On Tiger,
-    // we can't use this anyways, so it's just here to keep the compiler happy.
-    // However, when we're compiling for Tiger and running on Leopard, we
-    // might need the correct typedef, so this piece is copied from ATSTypes.h
-# ifdef __LP64__
-    typedef double CGFloat;
-# else
-    typedef float CGFloat;
-# endif
-#endif
-
-
 // Logging related functions and macros.
 //
 // This is a very simplistic logging facility built on top of ASL.  Two user

src/MacVim/MacVim.xcodeproj/project.pbxproj

@@ -29,7 +29,6 @@
 		1D80FBD60CBBD3B700102A1C /* MMVimView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80FBD20CBBD3B700102A1C /* MMVimView.m */; };
 		1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */; };
 		1D8BEA74104992290069B072 /* FindAndReplace.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1D8BEA73104992290069B072 /* FindAndReplace.nib */; };
-		1D9918490D299F9900A96335 /* MMAtsuiTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D9918470D299F9900A96335 /* MMAtsuiTextView.m */; };
 		1D9C60520EF79C0C0034AD44 /* MacVim.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1D9C602E0EF79C0C0034AD44 /* MacVim.icns */; };
 		1DCD00BF0E50B2B700460166 /* Attention.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AA0E50B2B700460166 /* Attention.png */; };
 		1DCD00C00E50B2B700460166 /* Copy.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AB0E50B2B700460166 /* Copy.png */; };
@@ -190,8 +189,6 @@
 		1D80FBD10CBBD3B700102A1C /* MMVimView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMVimView.h; sourceTree = "<group>"; };
 		1D80FBD20CBBD3B700102A1C /* MMVimView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMVimView.m; sourceTree = "<group>"; };
 		1D8B5A52104AF9FF002E59D5 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		1D9918460D299F9900A96335 /* MMAtsuiTextView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMAtsuiTextView.h; sourceTree = "<group>"; };
-		1D9918470D299F9900A96335 /* MMAtsuiTextView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMAtsuiTextView.m; sourceTree = "<group>"; };
 		1D9C602E0EF79C0C0034AD44 /* MacVim.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = MacVim.icns; path = icons/MacVim.icns; sourceTree = "<group>"; };
 		1DCD00AA0E50B2B700460166 /* Attention.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Attention.png; path = Toolbar/Attention.png; sourceTree = "<group>"; };
 		1DCD00AB0E50B2B700460166 /* Copy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Copy.png; path = Toolbar/Copy.png; sourceTree = "<group>"; };
@@ -272,8 +269,6 @@
 				1DE3F8E90D50F84600052B9E /* MMPreferenceController.m */,
 				1DE9B94D0D341AB8008FEDD4 /* MMWindow.h */,
 				1DE9B94E0D341AB8008FEDD4 /* MMWindow.m */,
-				1D9918460D299F9900A96335 /* MMAtsuiTextView.h */,
-				1D9918470D299F9900A96335 /* MMAtsuiTextView.m */,
 				1D80FBCF0CBBD3B700102A1C /* MMFullScreenWindow.h */,
 				1D80FBD00CBBD3B700102A1C /* MMFullScreenWindow.m */,
 				1D80FBD10CBBD3B700102A1C /* MMVimView.h */,
@@ -611,7 +606,6 @@
 				1DD66ECE0C803D3600EBDAB3 /* MMApplication.m in Sources */,
 				1D80FBD40CBBD3B700102A1C /* MMFullScreenWindow.m in Sources */,
 				1D80FBD60CBBD3B700102A1C /* MMVimView.m in Sources */,
-				1D9918490D299F9900A96335 /* MMAtsuiTextView.m in Sources */,
 				1DE9B9500D341AB8008FEDD4 /* MMWindow.m in Sources */,
 				1DE3F8EB0D50F84600052B9E /* MMPreferenceController.m in Sources */,
 				0395A8330D71ED7800881434 /* DBPrefsWindowController.m in Sources */,

src/MacVim/MacVim_legacy.xcodeproj/project.pbxproj

@@ -1,720 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 42;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		0395A8330D71ED7800881434 /* DBPrefsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0395A8320D71ED7800881434 /* DBPrefsWindowController.m */; };
-		0395A8AA0D72D88B00881434 /* General.png in Resources */ = {isa = PBXBuildFile; fileRef = 0395A8A90D72D88B00881434 /* General.png */; };
-		1D09AB420C6A4D520045497E /* MMTypesetter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D09AB400C6A4D520045497E /* MMTypesetter.m */; };
-		1D0E051C0BA5F83800B6049E /* Colors.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1D0E051B0BA5F83800B6049E /* Colors.plist */; };
-		1D145C7F0E5227CE00691AA0 /* MMTextViewHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D145C7E0E5227CE00691AA0 /* MMTextViewHelper.m */; };
-		1D1474980C56703C0038FA2B /* MacVim.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474960C56703C0038FA2B /* MacVim.m */; };
-		1D1474A00C5673AE0038FA2B /* MMAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D14749E0C5673AE0038FA2B /* MMAppController.m */; };
-		1D1474AA0C5677450038FA2B /* MMTextStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474A80C5677450038FA2B /* MMTextStorage.m */; };
-		1D1474B00C5678370038FA2B /* MMTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474AE0C5678370038FA2B /* MMTextView.m */; };
-		1D1474B60C56796D0038FA2B /* MMVimController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474B40C56796D0038FA2B /* MMVimController.m */; };
-		1D1474BC0C567A910038FA2B /* MMWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474BA0C567A910038FA2B /* MMWindowController.m */; };
-		1D22374B0E45DF4800E6FFFF /* Advanced.png in Resources */ = {isa = PBXBuildFile; fileRef = 1D22374A0E45DF4800E6FFFF /* Advanced.png */; };
-		1D384A0E100D671700D3C22F /* KeyBinding.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1D384A0D100D671700D3C22F /* KeyBinding.plist */; };
-		1D44972211FCA9B400B0630F /* MMCoreTextView+ToolTip.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D44972111FCA9B400B0630F /* MMCoreTextView+ToolTip.m */; };
-		1D493D580C5247BF00AB718C /* Vim in Copy Executables */ = {isa = PBXBuildFile; fileRef = 1D493D570C5247BF00AB718C /* Vim */; };
-		1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; };
-		1D60088B0E96A0B2003763F0 /* MMFindReplaceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D60088A0E96A0B2003763F0 /* MMFindReplaceController.m */; };
-		1D80591F0E1185EA001699D1 /* Miscellaneous.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80591D0E1185EA001699D1 /* Miscellaneous.m */; };
-		1D80FBD40CBBD3B700102A1C /* MMFullScreenWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80FBD00CBBD3B700102A1C /* MMFullScreenWindow.m */; };
-		1D80FBD60CBBD3B700102A1C /* MMVimView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80FBD20CBBD3B700102A1C /* MMVimView.m */; };
-		1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */; };
-		1D8BEA74104992290069B072 /* FindAndReplace.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1D8BEA73104992290069B072 /* FindAndReplace.nib */; };
-		1D9918490D299F9900A96335 /* MMAtsuiTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D9918470D299F9900A96335 /* MMAtsuiTextView.m */; };
-		1D9C60520EF79C0C0034AD44 /* MacVim.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1D9C602E0EF79C0C0034AD44 /* MacVim.icns */; };
-		1DCD00BF0E50B2B700460166 /* Attention.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AA0E50B2B700460166 /* Attention.png */; };
-		1DCD00C00E50B2B700460166 /* Copy.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AB0E50B2B700460166 /* Copy.png */; };
-		1DCD00C10E50B2B700460166 /* Cut.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AC0E50B2B700460166 /* Cut.png */; };
-		1DCD00C20E50B2B700460166 /* FindHelp.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AD0E50B2B700460166 /* FindHelp.png */; };
-		1DCD00C30E50B2B700460166 /* FindNext.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AE0E50B2B700460166 /* FindNext.png */; };
-		1DCD00C40E50B2B700460166 /* FindPrev.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AF0E50B2B700460166 /* FindPrev.png */; };
-		1DCD00C50E50B2B700460166 /* Help.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B00E50B2B700460166 /* Help.png */; };
-		1DCD00C60E50B2B700460166 /* LoadSesn.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B10E50B2B700460166 /* LoadSesn.png */; };
-		1DCD00C70E50B2B700460166 /* Make.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B20E50B2B700460166 /* Make.png */; };
-		1DCD00C80E50B2B700460166 /* Open.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B30E50B2B700460166 /* Open.png */; };
-		1DCD00C90E50B2B700460166 /* Paste.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B40E50B2B700460166 /* Paste.png */; };
-		1DCD00CA0E50B2B700460166 /* Print.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B50E50B2B700460166 /* Print.png */; };
-		1DCD00CB0E50B2B700460166 /* Redo.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B60E50B2B700460166 /* Redo.png */; };
-		1DCD00CC0E50B2B700460166 /* Replace.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B70E50B2B700460166 /* Replace.png */; };
-		1DCD00CD0E50B2B700460166 /* RunCtags.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B80E50B2B700460166 /* RunCtags.png */; };
-		1DCD00CE0E50B2B700460166 /* RunScript.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B90E50B2B700460166 /* RunScript.png */; };
-		1DCD00CF0E50B2B700460166 /* Save.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00BA0E50B2B700460166 /* Save.png */; };
-		1DCD00D00E50B2B700460166 /* SaveAll.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00BB0E50B2B700460166 /* SaveAll.png */; };
-		1DCD00D10E50B2B700460166 /* SaveSesn.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00BC0E50B2B700460166 /* SaveSesn.png */; };
-		1DCD00D20E50B2B700460166 /* TagJump.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00BD0E50B2B700460166 /* TagJump.png */; };
-		1DCD00D30E50B2B700460166 /* Undo.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00BE0E50B2B700460166 /* Undo.png */; };
-		1DD04DEC0C529C5E006CDC2B /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 1DD04DEB0C529C5E006CDC2B /* Credits.rtf */; };
-		1DD0C20C0C60FFB4008CD84A /* gvimrc in Copy Vim Runtime Files */ = {isa = PBXBuildFile; fileRef = 1DD0C20A0C60FF9A008CD84A /* gvimrc */; };
-		1DD3D51E0D82D4C9006E4320 /* ibeam.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD3D51D0D82D4C9006E4320 /* ibeam.png */; };
-		1DD66ECE0C803D3600EBDAB3 /* MMApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DD66ECC0C803D3600EBDAB3 /* MMApplication.m */; };
-		1DD9F5E50C85D60500E8D5A5 /* SystemColors.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1DD9F5E40C85D60500E8D5A5 /* SystemColors.plist */; };
-		1DE3F8E70D50F80500052B9E /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1DE3F8E50D50F80500052B9E /* Preferences.nib */; };
-		1DE3F8EB0D50F84600052B9E /* MMPreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE3F8E90D50F84600052B9E /* MMPreferenceController.m */; };
-		1DE608B40C587FDA0055263D /* runtime in Copy Vim Runtime Files */ = {isa = PBXBuildFile; fileRef = 1DE602470C587FD10055263D /* runtime */; };
-		1DE63FFB0E71820F00959BDB /* MMCoreTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE63FFA0E71820F00959BDB /* MMCoreTextView.m */; };
-		1DE8CC620C5E2AAD003F56E3 /* Actions.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1DE8CC610C5E2AAD003F56E3 /* Actions.plist */; };
-		1DE9B9500D341AB8008FEDD4 /* MMWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE9B94E0D341AB8008FEDD4 /* MMWindow.m */; };
-		1DED78600C6DE43D0079945F /* vimrc in Copy Vim Runtime Files */ = {isa = PBXBuildFile; fileRef = 1DED785F0C6DE43D0079945F /* vimrc */; };
-		1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; };
-		8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
-		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
-		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
-		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		1D493DB80C52533B00AB718C /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 1D493DB30C52533B00AB718C /* PSMTabBarControl_legacy.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 53DF68FD067E5B5A0090B5B0;
-			remoteInfo = PSMTabBarControlFramework;
-		};
-		1D493DCC0C5254A400AB718C /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 1D493DB30C52533B00AB718C /* PSMTabBarControl_legacy.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 53DF68FC067E5B5A0090B5B0;
-			remoteInfo = PSMTabBarControlFramework;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		1D0DCAD80BA3604D00B6CCFA /* Copy Executables */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 6;
-			files = (
-				1D493D580C5247BF00AB718C /* Vim in Copy Executables */,
-			);
-			name = "Copy Executables";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		1D9EB2840C366D7B0074B739 /* Copy Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */,
-			);
-			name = "Copy Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		1DE608B80C58807F0055263D /* Copy Vim Runtime Files */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = vim;
-			dstSubfolderSpec = 7;
-			files = (
-				1DED78600C6DE43D0079945F /* vimrc in Copy Vim Runtime Files */,
-				1DD0C20C0C60FFB4008CD84A /* gvimrc in Copy Vim Runtime Files */,
-				1DE608B40C587FDA0055263D /* runtime in Copy Vim Runtime Files */,
-			);
-			name = "Copy Vim Runtime Files";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		0395A8310D71ED7800881434 /* DBPrefsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBPrefsWindowController.h; sourceTree = "<group>"; };
-		0395A8320D71ED7800881434 /* DBPrefsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBPrefsWindowController.m; sourceTree = "<group>"; };
-		0395A8A90D72D88B00881434 /* General.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = General.png; sourceTree = "<group>"; };
-		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-		1D09AB3F0C6A4D520045497E /* MMTypesetter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMTypesetter.h; sourceTree = "<group>"; };
-		1D09AB400C6A4D520045497E /* MMTypesetter.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMTypesetter.m; sourceTree = "<group>"; };
-		1D0E051B0BA5F83800B6049E /* Colors.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Colors.plist; sourceTree = "<group>"; };
-		1D145C7D0E5227CE00691AA0 /* MMTextViewHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMTextViewHelper.h; sourceTree = "<group>"; };
-		1D145C7E0E5227CE00691AA0 /* MMTextViewHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMTextViewHelper.m; sourceTree = "<group>"; };
-		1D1474950C56703C0038FA2B /* MacVim.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MacVim.h; sourceTree = "<group>"; };
-		1D1474960C56703C0038FA2B /* MacVim.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MacVim.m; sourceTree = "<group>"; };
-		1D14749D0C5673AE0038FA2B /* MMAppController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMAppController.h; sourceTree = "<group>"; };
-		1D14749E0C5673AE0038FA2B /* MMAppController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMAppController.m; sourceTree = "<group>"; };
-		1D1474A70C5677450038FA2B /* MMTextStorage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMTextStorage.h; sourceTree = "<group>"; };
-		1D1474A80C5677450038FA2B /* MMTextStorage.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMTextStorage.m; sourceTree = "<group>"; };
-		1D1474AD0C5678370038FA2B /* MMTextView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMTextView.h; sourceTree = "<group>"; };
-		1D1474AE0C5678370038FA2B /* MMTextView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMTextView.m; sourceTree = "<group>"; };
-		1D1474B30C56796D0038FA2B /* MMVimController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMVimController.h; sourceTree = "<group>"; };
-		1D1474B40C56796D0038FA2B /* MMVimController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMVimController.m; sourceTree = "<group>"; };
-		1D1474B90C567A910038FA2B /* MMWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMWindowController.h; sourceTree = "<group>"; };
-		1D1474BA0C567A910038FA2B /* MMWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMWindowController.m; sourceTree = "<group>"; };
-		1D22374A0E45DF4800E6FFFF /* Advanced.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Advanced.png; sourceTree = "<group>"; };
-		1D384A0D100D671700D3C22F /* KeyBinding.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = KeyBinding.plist; sourceTree = "<group>"; };
-		1D44972111FCA9B400B0630F /* MMCoreTextView+ToolTip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MMCoreTextView+ToolTip.m"; sourceTree = "<group>"; };
-		1D493D570C5247BF00AB718C /* Vim */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = Vim; path = ../Vim; sourceTree = SOURCE_ROOT; };
-		1D493DB30C52533B00AB718C /* PSMTabBarControl_legacy.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PSMTabBarControl_legacy.xcodeproj; path = PSMTabBarControl/PSMTabBarControl_legacy.xcodeproj; sourceTree = "<group>"; };
-		1D6008820E96886D003763F0 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/FindAndReplace.nib; sourceTree = "<group>"; };
-		1D6008890E96A0B2003763F0 /* MMFindReplaceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMFindReplaceController.h; sourceTree = "<group>"; };
-		1D60088A0E96A0B2003763F0 /* MMFindReplaceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMFindReplaceController.m; sourceTree = "<group>"; };
-		1D80591D0E1185EA001699D1 /* Miscellaneous.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Miscellaneous.m; sourceTree = "<group>"; };
-		1D8059220E118663001699D1 /* Miscellaneous.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Miscellaneous.h; sourceTree = "<group>"; };
-		1D80FBCF0CBBD3B700102A1C /* MMFullScreenWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMFullScreenWindow.h; sourceTree = "<group>"; };
-		1D80FBD00CBBD3B700102A1C /* MMFullScreenWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMFullScreenWindow.m; sourceTree = "<group>"; };
-		1D80FBD10CBBD3B700102A1C /* MMVimView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMVimView.h; sourceTree = "<group>"; };
-		1D80FBD20CBBD3B700102A1C /* MMVimView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMVimView.m; sourceTree = "<group>"; };
-		1D8B5A52104AF9FF002E59D5 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		1D9918460D299F9900A96335 /* MMAtsuiTextView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMAtsuiTextView.h; sourceTree = "<group>"; };
-		1D9918470D299F9900A96335 /* MMAtsuiTextView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMAtsuiTextView.m; sourceTree = "<group>"; };
-		1D9C602E0EF79C0C0034AD44 /* MacVim.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = MacVim.icns; path = icons/MacVim.icns; sourceTree = "<group>"; };
-		1DCD00AA0E50B2B700460166 /* Attention.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Attention.png; path = Toolbar/Attention.png; sourceTree = "<group>"; };
-		1DCD00AB0E50B2B700460166 /* Copy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Copy.png; path = Toolbar/Copy.png; sourceTree = "<group>"; };
-		1DCD00AC0E50B2B700460166 /* Cut.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Cut.png; path = Toolbar/Cut.png; sourceTree = "<group>"; };
-		1DCD00AD0E50B2B700460166 /* FindHelp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FindHelp.png; path = Toolbar/FindHelp.png; sourceTree = "<group>"; };
-		1DCD00AE0E50B2B700460166 /* FindNext.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FindNext.png; path = Toolbar/FindNext.png; sourceTree = "<group>"; };
-		1DCD00AF0E50B2B700460166 /* FindPrev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FindPrev.png; path = Toolbar/FindPrev.png; sourceTree = "<group>"; };
-		1DCD00B00E50B2B700460166 /* Help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Help.png; path = Toolbar/Help.png; sourceTree = "<group>"; };
-		1DCD00B10E50B2B700460166 /* LoadSesn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = LoadSesn.png; path = Toolbar/LoadSesn.png; sourceTree = "<group>"; };
-		1DCD00B20E50B2B700460166 /* Make.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Make.png; path = Toolbar/Make.png; sourceTree = "<group>"; };
-		1DCD00B30E50B2B700460166 /* Open.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Open.png; path = Toolbar/Open.png; sourceTree = "<group>"; };
-		1DCD00B40E50B2B700460166 /* Paste.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Paste.png; path = Toolbar/Paste.png; sourceTree = "<group>"; };
-		1DCD00B50E50B2B700460166 /* Print.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Print.png; path = Toolbar/Print.png; sourceTree = "<group>"; };
-		1DCD00B60E50B2B700460166 /* Redo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Redo.png; path = Toolbar/Redo.png; sourceTree = "<group>"; };
-		1DCD00B70E50B2B700460166 /* Replace.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Replace.png; path = Toolbar/Replace.png; sourceTree = "<group>"; };
-		1DCD00B80E50B2B700460166 /* RunCtags.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RunCtags.png; path = Toolbar/RunCtags.png; sourceTree = "<group>"; };
-		1DCD00B90E50B2B700460166 /* RunScript.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RunScript.png; path = Toolbar/RunScript.png; sourceTree = "<group>"; };
-		1DCD00BA0E50B2B700460166 /* Save.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Save.png; path = Toolbar/Save.png; sourceTree = "<group>"; };
-		1DCD00BB0E50B2B700460166 /* SaveAll.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SaveAll.png; path = Toolbar/SaveAll.png; sourceTree = "<group>"; };
-		1DCD00BC0E50B2B700460166 /* SaveSesn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SaveSesn.png; path = Toolbar/SaveSesn.png; sourceTree = "<group>"; };
-		1DCD00BD0E50B2B700460166 /* TagJump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TagJump.png; path = Toolbar/TagJump.png; sourceTree = "<group>"; };
-		1DCD00BE0E50B2B700460166 /* Undo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Undo.png; path = Toolbar/Undo.png; sourceTree = "<group>"; };
-		1DD04DEB0C529C5E006CDC2B /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = "<group>"; };
-		1DD0C20A0C60FF9A008CD84A /* gvimrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gvimrc; sourceTree = "<group>"; };
-		1DD3D51D0D82D4C9006E4320 /* ibeam.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ibeam.png; sourceTree = "<group>"; };
-		1DD66ECB0C803D3600EBDAB3 /* MMApplication.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMApplication.h; sourceTree = "<group>"; };
-		1DD66ECC0C803D3600EBDAB3 /* MMApplication.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMApplication.m; sourceTree = "<group>"; };
-		1DD9F5E40C85D60500E8D5A5 /* SystemColors.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SystemColors.plist; sourceTree = "<group>"; };
-		1DE3F8E60D50F80500052B9E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Preferences.nib; sourceTree = "<group>"; };
-		1DE3F8E80D50F84600052B9E /* MMPreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMPreferenceController.h; sourceTree = "<group>"; };
-		1DE3F8E90D50F84600052B9E /* MMPreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMPreferenceController.m; sourceTree = "<group>"; };
-		1DE602470C587FD10055263D /* runtime */ = {isa = PBXFileReference; lastKnownFileType = folder; name = runtime; path = ../../runtime; sourceTree = SOURCE_ROOT; };
-		1DE63FF90E71820F00959BDB /* MMCoreTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMCoreTextView.h; sourceTree = "<group>"; };
-		1DE63FFA0E71820F00959BDB /* MMCoreTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMCoreTextView.m; sourceTree = "<group>"; };
-		1DE8CC610C5E2AAD003F56E3 /* Actions.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Actions.plist; sourceTree = "<group>"; };
-		1DE9B94D0D341AB8008FEDD4 /* MMWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMWindow.h; sourceTree = "<group>"; };
-		1DE9B94E0D341AB8008FEDD4 /* MMWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMWindow.m; sourceTree = "<group>"; };
-		1DED785F0C6DE43D0079945F /* vimrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vimrc; sourceTree = "<group>"; };
-		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
-		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
-		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-		32CA4F630368D1EE00C91783 /* MacVim_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacVim_Prefix.pch; sourceTree = "<group>"; };
-		8D1107310486CEB800E47090 /* Info_legacy.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info_legacy.plist; sourceTree = "<group>"; };
-		8D1107320486CEB800E47090 /* MacVim.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacVim.app; sourceTree = BUILT_PRODUCTS_DIR; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		8D11072E0486CEB800E47090 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */,
-				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
-				1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		080E96DDFE201D6D7F000001 /* MacVim Source */ = {
-			isa = PBXGroup;
-			children = (
-				1D44972111FCA9B400B0630F /* MMCoreTextView+ToolTip.m */,
-				1D6008890E96A0B2003763F0 /* MMFindReplaceController.h */,
-				1D60088A0E96A0B2003763F0 /* MMFindReplaceController.m */,
-				1DE63FF90E71820F00959BDB /* MMCoreTextView.h */,
-				1DE63FFA0E71820F00959BDB /* MMCoreTextView.m */,
-				1D145C7D0E5227CE00691AA0 /* MMTextViewHelper.h */,
-				1D145C7E0E5227CE00691AA0 /* MMTextViewHelper.m */,
-				1D8059220E118663001699D1 /* Miscellaneous.h */,
-				1D80591D0E1185EA001699D1 /* Miscellaneous.m */,
-				0395A8310D71ED7800881434 /* DBPrefsWindowController.h */,
-				0395A8320D71ED7800881434 /* DBPrefsWindowController.m */,
-				1DE3F8E80D50F84600052B9E /* MMPreferenceController.h */,
-				1DE3F8E90D50F84600052B9E /* MMPreferenceController.m */,
-				1DE9B94D0D341AB8008FEDD4 /* MMWindow.h */,
-				1DE9B94E0D341AB8008FEDD4 /* MMWindow.m */,
-				1D9918460D299F9900A96335 /* MMAtsuiTextView.h */,
-				1D9918470D299F9900A96335 /* MMAtsuiTextView.m */,
-				1D80FBCF0CBBD3B700102A1C /* MMFullScreenWindow.h */,
-				1D80FBD00CBBD3B700102A1C /* MMFullScreenWindow.m */,
-				1D80FBD10CBBD3B700102A1C /* MMVimView.h */,
-				1D80FBD20CBBD3B700102A1C /* MMVimView.m */,
-				1DD66ECB0C803D3600EBDAB3 /* MMApplication.h */,
-				1DD66ECC0C803D3600EBDAB3 /* MMApplication.m */,
-				1D09AB3F0C6A4D520045497E /* MMTypesetter.h */,
-				1D09AB400C6A4D520045497E /* MMTypesetter.m */,
-				1D1474B90C567A910038FA2B /* MMWindowController.h */,
-				1D1474BA0C567A910038FA2B /* MMWindowController.m */,
-				1D1474B30C56796D0038FA2B /* MMVimController.h */,
-				1D1474B40C56796D0038FA2B /* MMVimController.m */,
-				1D1474AD0C5678370038FA2B /* MMTextView.h */,
-				1D1474AE0C5678370038FA2B /* MMTextView.m */,
-				1D1474A70C5677450038FA2B /* MMTextStorage.h */,
-				1D1474A80C5677450038FA2B /* MMTextStorage.m */,
-				1D14749D0C5673AE0038FA2B /* MMAppController.h */,
-				1D14749E0C5673AE0038FA2B /* MMAppController.m */,
-				1D1474950C56703C0038FA2B /* MacVim.h */,
-				1D1474960C56703C0038FA2B /* MacVim.m */,
-				32CA4F630368D1EE00C91783 /* MacVim_Prefix.pch */,
-				29B97316FDCFA39411CA2CEA /* main.m */,
-			);
-			name = "MacVim Source";
-			sourceTree = "<group>";
-		};
-		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
-			);
-			name = "Linked Frameworks";
-			sourceTree = "<group>";
-		};
-		1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				29B97324FDCFA39411CA2CEA /* AppKit.framework */,
-				29B97325FDCFA39411CA2CEA /* Foundation.framework */,
-			);
-			name = "Other Frameworks";
-			sourceTree = "<group>";
-		};
-		19C28FACFE9D520D11CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				8D1107320486CEB800E47090 /* MacVim.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		1D0F11480D58C77800D5DA09 /* Font */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = Font;
-			sourceTree = "<group>";
-		};
-		1D493D640C52482B00AB718C /* Executables */ = {
-			isa = PBXGroup;
-			children = (
-				1D493D570C5247BF00AB718C /* Vim */,
-			);
-			name = Executables;
-			sourceTree = "<group>";
-		};
-		1D493DB40C52533B00AB718C /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		1DE602460C587F760055263D /* Vim Resources */ = {
-			isa = PBXGroup;
-			children = (
-				1DED785F0C6DE43D0079945F /* vimrc */,
-				1DD0C20A0C60FF9A008CD84A /* gvimrc */,
-				1DE602470C587FD10055263D /* runtime */,
-			);
-			name = "Vim Resources";
-			sourceTree = "<group>";
-		};
-		1DE9726C0C48050600F96A9F /* Toolbar */ = {
-			isa = PBXGroup;
-			children = (
-				1DCD00AA0E50B2B700460166 /* Attention.png */,
-				1DCD00AB0E50B2B700460166 /* Copy.png */,
-				1DCD00AC0E50B2B700460166 /* Cut.png */,
-				1DCD00AD0E50B2B700460166 /* FindHelp.png */,
-				1DCD00AE0E50B2B700460166 /* FindNext.png */,
-				1DCD00AF0E50B2B700460166 /* FindPrev.png */,
-				1DCD00B00E50B2B700460166 /* Help.png */,
-				1DCD00B10E50B2B700460166 /* LoadSesn.png */,
-				1DCD00B20E50B2B700460166 /* Make.png */,
-				1DCD00B30E50B2B700460166 /* Open.png */,
-				1DCD00B40E50B2B700460166 /* Paste.png */,
-				1DCD00B50E50B2B700460166 /* Print.png */,
-				1DCD00B60E50B2B700460166 /* Redo.png */,
-				1DCD00B70E50B2B700460166 /* Replace.png */,
-				1DCD00B80E50B2B700460166 /* RunCtags.png */,
-				1DCD00B90E50B2B700460166 /* RunScript.png */,
-				1DCD00BA0E50B2B700460166 /* Save.png */,
-				1DCD00BB0E50B2B700460166 /* SaveAll.png */,
-				1DCD00BC0E50B2B700460166 /* SaveSesn.png */,
-				1DCD00BD0E50B2B700460166 /* TagJump.png */,
-				1DCD00BE0E50B2B700460166 /* Undo.png */,
-			);
-			name = Toolbar;
-			sourceTree = "<group>";
-		};
-		29B97314FDCFA39411CA2CEA /* MacVim */ = {
-			isa = PBXGroup;
-			children = (
-				1D493D640C52482B00AB718C /* Executables */,
-				080E96DDFE201D6D7F000001 /* MacVim Source */,
-				29B97317FDCFA39411CA2CEA /* Resources */,
-				1DE602460C587F760055263D /* Vim Resources */,
-				29B97323FDCFA39411CA2CEA /* Frameworks */,
-				19C28FACFE9D520D11CA2CBB /* Products */,
-			);
-			name = MacVim;
-			sourceTree = "<group>";
-		};
-		29B97317FDCFA39411CA2CEA /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				1D384A0D100D671700D3C22F /* KeyBinding.plist */,
-				1D9C602E0EF79C0C0034AD44 /* MacVim.icns */,
-				1D8BEA73104992290069B072 /* FindAndReplace.nib */,
-				0395A8A90D72D88B00881434 /* General.png */,
-				1D22374A0E45DF4800E6FFFF /* Advanced.png */,
-				1DD3D51D0D82D4C9006E4320 /* ibeam.png */,
-				1D0F11480D58C77800D5DA09 /* Font */,
-				1DE9726C0C48050600F96A9F /* Toolbar */,
-				1DD9F5E40C85D60500E8D5A5 /* SystemColors.plist */,
-				1DE8CC610C5E2AAD003F56E3 /* Actions.plist */,
-				1DD04DEB0C529C5E006CDC2B /* Credits.rtf */,
-				1D0E051B0BA5F83800B6049E /* Colors.plist */,
-				8D1107310486CEB800E47090 /* Info_legacy.plist */,
-				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
-				1DE3F8E50D50F80500052B9E /* Preferences.nib */,
-				29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				1D8B5A52104AF9FF002E59D5 /* Carbon.framework */,
-				1D493DB30C52533B00AB718C /* PSMTabBarControl_legacy.xcodeproj */,
-				1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
-				1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		8D1107260486CEB800E47090 /* MacVim */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "MacVim" */;
-			buildPhases = (
-				8D1107290486CEB800E47090 /* Resources */,
-				8D11072C0486CEB800E47090 /* Sources */,
-				8D11072E0486CEB800E47090 /* Frameworks */,
-				1D0DCAD80BA3604D00B6CCFA /* Copy Executables */,
-				1D9EB2840C366D7B0074B739 /* Copy Frameworks */,
-				1DE608B80C58807F0055263D /* Copy Vim Runtime Files */,
-				1D1C31F00EFFBFD6003FE9A5 /* Make Document Icons */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				1D493DCD0C5254A400AB718C /* PBXTargetDependency */,
-			);
-			name = MacVim;
-			productInstallPath = "$(HOME)/Applications";
-			productName = MacVim;
-			productReference = 8D1107320486CEB800E47090 /* MacVim.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		29B97313FDCFA39411CA2CEA /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */;
-			compatibilityVersion = "Xcode 2.4";
-			developmentRegion = English;
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
-				Swedish,
-			);
-			mainGroup = 29B97314FDCFA39411CA2CEA /* MacVim */;
-			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = 1D493DB40C52533B00AB718C /* Products */;
-					ProjectRef = 1D493DB30C52533B00AB718C /* PSMTabBarControl_legacy.xcodeproj */;
-				},
-			);
-			projectRoot = "";
-			targets = (
-				8D1107260486CEB800E47090 /* MacVim */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXReferenceProxy section */
-		1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = PSMTabBarControl.framework;
-			remoteRef = 1D493DB80C52533B00AB718C /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
-/* Begin PBXResourcesBuildPhase section */
-		8D1107290486CEB800E47090 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */,
-				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
-				1D0E051C0BA5F83800B6049E /* Colors.plist in Resources */,
-				1DD04DEC0C529C5E006CDC2B /* Credits.rtf in Resources */,
-				1DE8CC620C5E2AAD003F56E3 /* Actions.plist in Resources */,
-				1DD9F5E50C85D60500E8D5A5 /* SystemColors.plist in Resources */,
-				1DE3F8E70D50F80500052B9E /* Preferences.nib in Resources */,
-				0395A8AA0D72D88B00881434 /* General.png in Resources */,
-				1DD3D51E0D82D4C9006E4320 /* ibeam.png in Resources */,
-				1D22374B0E45DF4800E6FFFF /* Advanced.png in Resources */,
-				1DCD00BF0E50B2B700460166 /* Attention.png in Resources */,
-				1DCD00C00E50B2B700460166 /* Copy.png in Resources */,
-				1DCD00C10E50B2B700460166 /* Cut.png in Resources */,
-				1DCD00C20E50B2B700460166 /* FindHelp.png in Resources */,
-				1DCD00C30E50B2B700460166 /* FindNext.png in Resources */,
-				1DCD00C40E50B2B700460166 /* FindPrev.png in Resources */,
-				1DCD00C50E50B2B700460166 /* Help.png in Resources */,
-				1DCD00C60E50B2B700460166 /* LoadSesn.png in Resources */,
-				1DCD00C70E50B2B700460166 /* Make.png in Resources */,
-				1DCD00C80E50B2B700460166 /* Open.png in Resources */,
-				1DCD00C90E50B2B700460166 /* Paste.png in Resources */,
-				1DCD00CA0E50B2B700460166 /* Print.png in Resources */,
-				1DCD00CB0E50B2B700460166 /* Redo.png in Resources */,
-				1DCD00CC0E50B2B700460166 /* Replace.png in Resources */,
-				1DCD00CD0E50B2B700460166 /* RunCtags.png in Resources */,
-				1DCD00CE0E50B2B700460166 /* RunScript.png in Resources */,
-				1DCD00CF0E50B2B700460166 /* Save.png in Resources */,
-				1DCD00D00E50B2B700460166 /* SaveAll.png in Resources */,
-				1DCD00D10E50B2B700460166 /* SaveSesn.png in Resources */,
-				1DCD00D20E50B2B700460166 /* TagJump.png in Resources */,
-				1DCD00D30E50B2B700460166 /* Undo.png in Resources */,
-				1D8BEA74104992290069B072 /* FindAndReplace.nib in Resources */,
-				1D9C60520EF79C0C0034AD44 /* MacVim.icns in Resources */,
-				1D384A0E100D671700D3C22F /* KeyBinding.plist in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		1D1C31F00EFFBFD6003FE9A5 /* Make Document Icons */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Make Document Icons";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Clear deployment target, else the python script always thinks we're building on Tiger\nunset MACOSX_DEPLOYMENT_TARGET\n\n# Generate the icons (redirect stderr to ignore warnings)\ncd \"$PROJECT_DIR\"/icons/\nmake OUTDIR=\"$TARGET_BUILD_DIR\"/$UNLOCALIZED_RESOURCES_FOLDER_PATH 2> /dev/null\n";
-			showEnvVarsInLog = 0;
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		8D11072C0486CEB800E47090 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8D11072D0486CEB800E47090 /* main.m in Sources */,
-				1D1474980C56703C0038FA2B /* MacVim.m in Sources */,
-				1D1474A00C5673AE0038FA2B /* MMAppController.m in Sources */,
-				1D1474AA0C5677450038FA2B /* MMTextStorage.m in Sources */,
-				1D1474B00C5678370038FA2B /* MMTextView.m in Sources */,
-				1D1474B60C56796D0038FA2B /* MMVimController.m in Sources */,
-				1D1474BC0C567A910038FA2B /* MMWindowController.m in Sources */,
-				1D09AB420C6A4D520045497E /* MMTypesetter.m in Sources */,
-				1DD66ECE0C803D3600EBDAB3 /* MMApplication.m in Sources */,
-				1D80FBD40CBBD3B700102A1C /* MMFullScreenWindow.m in Sources */,
-				1D80FBD60CBBD3B700102A1C /* MMVimView.m in Sources */,
-				1D9918490D299F9900A96335 /* MMAtsuiTextView.m in Sources */,
-				1DE9B9500D341AB8008FEDD4 /* MMWindow.m in Sources */,
-				1DE3F8EB0D50F84600052B9E /* MMPreferenceController.m in Sources */,
-				0395A8330D71ED7800881434 /* DBPrefsWindowController.m in Sources */,
-				1D80591F0E1185EA001699D1 /* Miscellaneous.m in Sources */,
-				1D145C7F0E5227CE00691AA0 /* MMTextViewHelper.m in Sources */,
-				1D60088B0E96A0B2003763F0 /* MMFindReplaceController.m in Sources */,
-				1DE63FFB0E71820F00959BDB /* MMCoreTextView.m in Sources */,
-				1D44972211FCA9B400B0630F /* MMCoreTextView+ToolTip.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		1D493DCD0C5254A400AB718C /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = PSMTabBarControlFramework;
-			targetProxy = 1D493DCC0C5254A400AB718C /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				089C165DFE840E0CC02AAC07 /* English */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		1D8BEA73104992290069B072 /* FindAndReplace.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				1D6008820E96886D003763F0 /* English */,
-			);
-			name = FindAndReplace.nib;
-			sourceTree = "<group>";
-		};
-		1DE3F8E50D50F80500052B9E /* Preferences.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				1DE3F8E60D50F80500052B9E /* English */,
-			);
-			name = Preferences.nib;
-			sourceTree = "<group>";
-		};
-		29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				29B97319FDCFA39411CA2CEA /* English */,
-			);
-			name = MainMenu.nib;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		C01FCF4B08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-				);
-				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_VERSION = "";
-				GCC_WARN_PEDANTIC = NO;
-				HEADER_SEARCH_PATHS = "";
-				INFOPLIST_FILE = Info_legacy.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = "";
-				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_NAME = MacVim;
-				VERSIONING_SYSTEM = "apple-generic";
-				WARNING_CFLAGS = "-Wall";
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = NO;
-			};
-			name = Debug;
-		};
-		C01FCF4C08A954540054247B /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
-				COPY_PHASE_STRIP = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
-				);
-				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
-				GCC_DYNAMIC_NO_PIC = YES;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = s;
-				GCC_VERSION = "";
-				HEADER_SEARCH_PATHS = "";
-				INFOPLIST_FILE = Info_legacy.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = "";
-				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_NAME = MacVim;
-				VERSIONING_SYSTEM = "apple-generic";
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		C01FCF4F08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
-				GCC_VERSION = 4.2;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				SYMROOT = "$(PROJECT_DIR)/build";
-			};
-			name = Debug;
-		};
-		C01FCF5008A954540054247B /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
-				GCC_VERSION = 4.2;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				SYMROOT = "$(PROJECT_DIR)/build";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "MacVim" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C01FCF4B08A954540054247B /* Debug */,
-				C01FCF4C08A954540054247B /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C01FCF4F08A954540054247B /* Debug */,
-				C01FCF5008A954540054247B /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
-}

src/MacVim/Miscellaneous.h

@@ -16,10 +16,6 @@
 // TODO: Remove this when the inline IM code has been tested
 #define INCLUDE_OLD_IM_CODE
 
-// Use Core Text instead of ATSUI when compiling on 10.5+.
-// Note: Core Text was introduced with 10.5, ATSUI was deprecated on 10.6.
-#define MM_ENABLE_ATSUI (MAC_OS_X_VERSION_MIN_REQUIRED<MAC_OS_X_VERSION_10_5)
-
 
 // NSUserDefaults keys
 extern NSString *MMTabMinWidthKey;
@@ -40,7 +36,6 @@ extern NSString *MMNoFontSubstitutionKey;
 extern NSString *MMNoTitleBarWindowKey;
 extern NSString *MMLoginShellKey;
 extern NSString *MMUntitledWindowKey;
-extern NSString *MMTexturedWindowKey;
 extern NSString *MMZoomBothKey;
 extern NSString *MMCurrentPreferencePaneKey;
 extern NSString *MMLoginShellCommandKey;
@@ -107,11 +102,6 @@ enum {
 
 @interface NSSavePanel (MMExtras)
 - (void)hiddenFilesButtonToggled:(id)sender;
-#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6)
-// This method is a part of a public API as of Mac OS X 10.6.  Only use this
-// hack for earlier versions of Mac OS X.
-- (void)setShowsHiddenFiles:(BOOL)show;
-#endif
 @end
 
 

src/MacVim/Miscellaneous.m

@@ -32,7 +32,6 @@ NSString *MMNoFontSubstitutionKey       = @"MMNoFontSubstitution";
 NSString *MMNoTitleBarWindowKey         = @"MMNoTitleBarWindow";
 NSString *MMLoginShellKey               = @"MMLoginShell";
 NSString *MMUntitledWindowKey           = @"MMUntitledWindow";
-NSString *MMTexturedWindowKey           = @"MMTexturedWindow";
 NSString *MMZoomBothKey                 = @"MMZoomBoth";
 NSString *MMCurrentPreferencePaneKey    = @"MMCurrentPreferencePane";
 NSString *MMLoginShellCommandKey        = @"MMLoginShellCommand";
@@ -102,32 +101,6 @@ NSString *MMUseMouseTimeKey             = @"MMUseMouseTime";
     [self setShowsHiddenFiles:[sender intValue]];
 }
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6)
-// This method is a part of a public API as of Mac OS X 10.6.  Only use this
-// hack for earlier versions of Mac OS X.
-- (void)setShowsHiddenFiles:(BOOL)show
-{
-    // This is undocumented stuff, so be careful. This does the same as
-    //     [[self _navView] setShowsHiddenFiles:show];
-    // but does not produce warnings.
-
-    if (![self respondsToSelector:@selector(_navView)])
-        return;
-
-    id navView = [self performSelector:@selector(_navView)];
-    if (![navView respondsToSelector:@selector(setShowsHiddenFiles:)])
-        return;
-
-    // performSelector:withObject: does not support a BOOL
-    NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:
-        [navView methodSignatureForSelector:@selector(setShowsHiddenFiles:)]];
-    [invocation setTarget:navView];
-    [invocation setSelector:@selector(setShowsHiddenFiles:)];
-    [invocation setArgument:&show atIndex:2];
-    [invocation invoke];
-}
-#endif
-
 @end // NSSavePanel (MMExtras)
 
 

src/MacVim/PSMTabBarControl/PSMTabBarControlFramework-Info_legacy.plist

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>PSMTabBarControl</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.positivespinmedia.PSMTabBarControlFramework</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleSignature</key>
-	<string>PSM1</string>
-	<key>CFBundleVersion</key>
-	<string>1.1</string>
-	<key>NSPrincipalClass</key>
-	<string>PSMTabBarControl</string>
-</dict>
-</plist>

src/MacVim/PSMTabBarControl/PSMTabBarControl_legacy.xcodeproj/project.pbxproj

@@ -1,703 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 42;
-	objects = {
-
-/* Begin PBXAggregateTarget section */
-		53DF6901067E5B8E0090B5B0 /* All */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = C056398708A954F8003078D8 /* Build configuration list for PBXAggregateTarget "All" */;
-			buildPhases = (
-			);
-			dependencies = (
-				53DF6905067E5B930090B5B0 /* PBXTargetDependency */,
-			);
-			name = All;
-			productName = All;
-		};
-/* End PBXAggregateTarget section */
-
-/* Begin PBXBuildFile section */
-		13F8B89007B43554008AE28D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD92D38A0106425D02CA0E72 /* Cocoa.framework */; };
-		523897F415BDA9AC00498A53 /* TabClose_Front_Pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523897EE15BDA9AC00498A53 /* TabClose_Front_Pressed@2x.png */; };
-		523897F515BDA9AC00498A53 /* TabClose_Front_Rollover@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523897EF15BDA9AC00498A53 /* TabClose_Front_Rollover@2x.png */; };
-		523897F615BDA9AC00498A53 /* TabClose_Front@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523897F015BDA9AC00498A53 /* TabClose_Front@2x.png */; };
-		523897F715BDA9AC00498A53 /* TabNewMetal@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523897F115BDA9AC00498A53 /* TabNewMetal@2x.png */; };
-		523897F815BDA9AC00498A53 /* TabNewMetalPressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523897F215BDA9AC00498A53 /* TabNewMetalPressed@2x.png */; };
-		523897F915BDA9AC00498A53 /* TabNewMetalRollover@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523897F315BDA9AC00498A53 /* TabNewMetalRollover@2x.png */; };
-		52A57C0F15BBA230003EC59C /* TabClose_Front.png in Resources */ = {isa = PBXBuildFile; fileRef = 52A57C0C15BBA230003EC59C /* TabClose_Front.png */; };
-		52A57C1015BBA230003EC59C /* TabClose_Front_Pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 52A57C0D15BBA230003EC59C /* TabClose_Front_Pressed.png */; };
-		52A57C1115BBA230003EC59C /* TabClose_Front_Rollover.png in Resources */ = {isa = PBXBuildFile; fileRef = 52A57C0E15BBA230003EC59C /* TabClose_Front_Rollover.png */; };
-		52C0B9B415BDB7A9000C268F /* overflowImage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52C0B9B215BDB7A9000C268F /* overflowImage@2x.png */; };
-		52C0B9B515BDB7A9000C268F /* overflowImagePressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52C0B9B315BDB7A9000C268F /* overflowImagePressed@2x.png */; };
-		52C268D015BDB72B0012FECA /* overflowImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 52C268CE15BDB72B0012FECA /* overflowImage.png */; };
-		52C268D115BDB72B0012FECA /* overflowImagePressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 52C268CF15BDB72B0012FECA /* overflowImagePressed.png */; };
-		546DEAF1067F63070098DCC4 /* PSMTabBarControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0259C576FE90428111CA0C5A /* PSMTabBarControl.m */; };
-		546DEAF2067F630E0098DCC4 /* PSMTabBarControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 0259C57AFE90428111CA0C5A /* PSMTabBarControl.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		A2082A9009EAEB34009AC8BE /* PSMTabDragAssistant.h in Headers */ = {isa = PBXBuildFile; fileRef = A2082A8D09EAEB33009AC8BE /* PSMTabDragAssistant.h */; };
-		A2082A9109EAEB34009AC8BE /* PSMTabDragAssistant.m in Sources */ = {isa = PBXBuildFile; fileRef = A2082A8E09EAEB33009AC8BE /* PSMTabDragAssistant.m */; };
-		A2129BB209AEB58F00724E6C /* PSMProgressIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = A2129BAF09AEB58F00724E6C /* PSMProgressIndicator.h */; };
-		A2129BB309AEB58F00724E6C /* PSMProgressIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = A2129BB009AEB58F00724E6C /* PSMProgressIndicator.m */; };
-		A251BE850959A1B90058BC7F /* PSMOverflowPopUpButton.h in Headers */ = {isa = PBXBuildFile; fileRef = A251BE810959A1B90058BC7F /* PSMOverflowPopUpButton.h */; };
-		A251BE860959A1B90058BC7F /* PSMOverflowPopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A251BE820959A1B90058BC7F /* PSMOverflowPopUpButton.m */; };
-		A251BE870959A1B90058BC7F /* PSMTabBarCell.h in Headers */ = {isa = PBXBuildFile; fileRef = A251BE830959A1B90058BC7F /* PSMTabBarCell.h */; };
-		A251BE880959A1B90058BC7F /* PSMTabBarCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A251BE840959A1B90058BC7F /* PSMTabBarCell.m */; };
-		A268E80409A9822A00E082AA /* AquaTabNew.png in Resources */ = {isa = PBXBuildFile; fileRef = A268E7F809A9822900E082AA /* AquaTabNew.png */; };
-		A268E80509A9822A00E082AA /* AquaTabNewPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A268E7F909A9822900E082AA /* AquaTabNewPressed.png */; };
-		A268E80609A9822A00E082AA /* AquaTabNewRollover.png in Resources */ = {isa = PBXBuildFile; fileRef = A268E7FA09A9822900E082AA /* AquaTabNewRollover.png */; };
-		A268E80709A9822A00E082AA /* TabNewMetal.png in Resources */ = {isa = PBXBuildFile; fileRef = A268E7FB09A9822900E082AA /* TabNewMetal.png */; };
-		A268E80809A9822A00E082AA /* TabNewMetalPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A268E7FC09A9822900E082AA /* TabNewMetalPressed.png */; };
-		A268E80909A9822A00E082AA /* TabNewMetalRollover.png in Resources */ = {isa = PBXBuildFile; fileRef = A268E7FD09A9822900E082AA /* TabNewMetalRollover.png */; };
-		A268EA6209A9831800E082AA /* PSMRolloverButton.h in Headers */ = {isa = PBXBuildFile; fileRef = A268EA5F09A9831800E082AA /* PSMRolloverButton.h */; };
-		A268EA6309A9831800E082AA /* PSMRolloverButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A268EA6009A9831800E082AA /* PSMRolloverButton.m */; };
-		A27E47850A28EE76007BA395 /* TabIcon.tif in Resources */ = {isa = PBXBuildFile; fileRef = A20822F00959F6AA00C5F5A4 /* TabIcon.tif */; };
-		A27E47880A28EE7C007BA395 /* TabControlRep.tif in Resources */ = {isa = PBXBuildFile; fileRef = A20822EF0959F6AA00C5F5A4 /* TabControlRep.tif */; };
-		A2C0D99509AF870000ED379C /* pi.png in Resources */ = {isa = PBXBuildFile; fileRef = A2C0D99309AF870000ED379C /* pi.png */; };
-		A2D32EDC09A634C900EC8662 /* PSMTabStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D32EDA09A634C900EC8662 /* PSMTabStyle.h */; };
-		A2D32EF709A63BF700EC8662 /* AquaTabClose_Front_Pressed.tif in Resources */ = {isa = PBXBuildFile; fileRef = A2D32EF009A63BF700EC8662 /* AquaTabClose_Front_Pressed.tif */; };
-		A2D32EF809A63BF700EC8662 /* AquaTabClose_Front_Rollover.tif in Resources */ = {isa = PBXBuildFile; fileRef = A2D32EF109A63BF700EC8662 /* AquaTabClose_Front_Rollover.tif */; };
-		A2D32EF909A63BF700EC8662 /* AquaTabClose_Front.tif in Resources */ = {isa = PBXBuildFile; fileRef = A2D32EF209A63BF700EC8662 /* AquaTabClose_Front.tif */; };
-		A2D32EFA09A63BF700EC8662 /* AquaTabsBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D32EF309A63BF700EC8662 /* AquaTabsBackground.png */; };
-		A2D32EFB09A63BF700EC8662 /* AquaTabsDown.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D32EF409A63BF700EC8662 /* AquaTabsDown.png */; };
-		A2D32EFC09A63BF700EC8662 /* AquaTabsSeparator.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D32EF509A63BF700EC8662 /* AquaTabsSeparator.png */; };
-		A2D32EFD09A63BF700EC8662 /* AquaTabsSeparatorDown.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D32EF609A63BF700EC8662 /* AquaTabsSeparatorDown.png */; };
-		A2D32F0009A63D7A00EC8662 /* PSMMetalTabStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D32EFE09A63D7A00EC8662 /* PSMMetalTabStyle.h */; };
-		A2D32F0109A63D7A00EC8662 /* PSMMetalTabStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = A2D32EFF09A63D7A00EC8662 /* PSMMetalTabStyle.m */; };
-		A2D3317C09A68B7500EC8662 /* AquaTabsDownGraphite.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D3317A09A68B7500EC8662 /* AquaTabsDownGraphite.png */; };
-		A2D3317D09A68B7500EC8662 /* AquaTabsDownNonKey.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D3317B09A68B7500EC8662 /* AquaTabsDownNonKey.png */; };
-		A2D98B0A0A2B432C0064C6F8 /* PSMUnifiedTabStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D98B070A2B432C0064C6F8 /* PSMUnifiedTabStyle.h */; };
-		A2D98B0B0A2B432C0064C6F8 /* PSMUnifiedTabStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = A2D98B080A2B432C0064C6F8 /* PSMUnifiedTabStyle.m */; };
-		A2D98B120A2B43FA0064C6F8 /* NSBezierPath_AMShading.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D98B0F0A2B43FA0064C6F8 /* NSBezierPath_AMShading.h */; };
-		A2D98B130A2B43FA0064C6F8 /* NSBezierPath_AMShading.m in Sources */ = {isa = PBXBuildFile; fileRef = A2D98B100A2B43FA0064C6F8 /* NSBezierPath_AMShading.m */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		53DF6904067E5B930090B5B0 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0259C573FE90428111CA0C5A /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 53DF68FC067E5B5A0090B5B0;
-			remoteInfo = PSMTabBarControlFramework;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		0259C576FE90428111CA0C5A /* PSMTabBarControl.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PSMTabBarControl.m; path = source/PSMTabBarControl.m; sourceTree = "<group>"; };
-		0259C577FE90428111CA0C5A /* PSMTabBarControlInspector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PSMTabBarControlInspector.m; path = source/PSMTabBarControlInspector.m; sourceTree = "<group>"; };
-		0259C578FE90428111CA0C5A /* PSMTabBarControlPalette.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PSMTabBarControlPalette.m; path = source/PSMTabBarControlPalette.m; sourceTree = "<group>"; };
-		0259C57AFE90428111CA0C5A /* PSMTabBarControl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PSMTabBarControl.h; path = source/PSMTabBarControl.h; sourceTree = "<group>"; };
-		0259C57BFE90428111CA0C5A /* PSMTabBarControlInspector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PSMTabBarControlInspector.h; path = source/PSMTabBarControlInspector.h; sourceTree = "<group>"; };
-		0259C57CFE90428111CA0C5A /* PSMTabBarControlPalette.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PSMTabBarControlPalette.h; path = source/PSMTabBarControlPalette.h; sourceTree = "<group>"; };
-		0259C57FFE90428111CA0C5A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/PSMTabBarControlInspector.nib; sourceTree = "<group>"; };
-		0259C581FE90428111CA0C5A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/PSMTabBarControlPalette.nib; sourceTree = "<group>"; };
-		0259C583FE90428111CA0C5A /* palette.table */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = palette.table; sourceTree = "<group>"; };
-		13EB9DBD07DE0F1E00EB933A /* InterfaceBuilder.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InterfaceBuilder.framework; path = /System/Library/Frameworks/InterfaceBuilder.framework; sourceTree = "<absolute>"; };
-		13F8B88807B434F6008AE28D /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
-		13F8B88A07B434F6008AE28D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-		32DBCF980370C29C00C91783 /* PSMTabBarControl_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PSMTabBarControl_Prefix.pch; path = source/PSMTabBarControl_Prefix.pch; sourceTree = "<group>"; };
-		523897EE15BDA9AC00498A53 /* TabClose_Front_Pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TabClose_Front_Pressed@2x.png"; path = "images/TabClose_Front_Pressed@2x.png"; sourceTree = "<group>"; };
-		523897EF15BDA9AC00498A53 /* TabClose_Front_Rollover@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TabClose_Front_Rollover@2x.png"; path = "images/TabClose_Front_Rollover@2x.png"; sourceTree = "<group>"; };
-		523897F015BDA9AC00498A53 /* TabClose_Front@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TabClose_Front@2x.png"; path = "images/TabClose_Front@2x.png"; sourceTree = "<group>"; };
-		523897F115BDA9AC00498A53 /* TabNewMetal@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TabNewMetal@2x.png"; path = "images/TabNewMetal@2x.png"; sourceTree = "<group>"; };
-		523897F215BDA9AC00498A53 /* TabNewMetalPressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TabNewMetalPressed@2x.png"; path = "images/TabNewMetalPressed@2x.png"; sourceTree = "<group>"; };
-		523897F315BDA9AC00498A53 /* TabNewMetalRollover@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TabNewMetalRollover@2x.png"; path = "images/TabNewMetalRollover@2x.png"; sourceTree = "<group>"; };
-		52A57C0C15BBA230003EC59C /* TabClose_Front.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TabClose_Front.png; path = images/TabClose_Front.png; sourceTree = "<group>"; };
-		52A57C0D15BBA230003EC59C /* TabClose_Front_Pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TabClose_Front_Pressed.png; path = images/TabClose_Front_Pressed.png; sourceTree = "<group>"; };
-		52A57C0E15BBA230003EC59C /* TabClose_Front_Rollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TabClose_Front_Rollover.png; path = images/TabClose_Front_Rollover.png; sourceTree = "<group>"; };
-		52C0B9B215BDB7A9000C268F /* overflowImage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "overflowImage@2x.png"; path = "images/overflowImage@2x.png"; sourceTree = "<group>"; };
-		52C0B9B315BDB7A9000C268F /* overflowImagePressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "overflowImagePressed@2x.png"; path = "images/overflowImagePressed@2x.png"; sourceTree = "<group>"; };
-		52C268CE15BDB72B0012FECA /* overflowImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = overflowImage.png; path = images/overflowImage.png; sourceTree = "<group>"; };
-		52C268CF15BDB72B0012FECA /* overflowImagePressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = overflowImagePressed.png; path = images/overflowImagePressed.png; sourceTree = "<group>"; };
-		53DF68FD067E5B5A0090B5B0 /* PSMTabBarControl.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PSMTabBarControl.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		53DF68FE067E5B5A0090B5B0 /* PSMTabBarControlFramework-Info_legacy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PSMTabBarControlFramework-Info_legacy.plist"; sourceTree = "<group>"; };
-		54D33B2806778E3300C9C163 /* PSMTabBarControl.ibclassdescription */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PSMTabBarControl.ibclassdescription; sourceTree = "<group>"; };
-		8D1AC9730486D14A00FE50C9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
-		8D1AC97B0486D23100FE50C9 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		A2072A2409ABD88600304BCB /* Folder.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Folder.tif; path = images/Folder.tif; sourceTree = "<group>"; };
-		A2072A2509ABD88600304BCB /* Globe.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Globe.tiff; path = images/Globe.tiff; sourceTree = "<group>"; };
-		A2072B5C09AC1FA500304BCB /* Warning.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Warning.png; path = images/Warning.png; sourceTree = "<group>"; };
-		A20822EF0959F6AA00C5F5A4 /* TabControlRep.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = TabControlRep.tif; path = images/TabControlRep.tif; sourceTree = "<group>"; };
-		A20822F00959F6AA00C5F5A4 /* TabIcon.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = TabIcon.tif; path = images/TabIcon.tif; sourceTree = "<group>"; };
-		A2082A8D09EAEB33009AC8BE /* PSMTabDragAssistant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PSMTabDragAssistant.h; path = source/PSMTabDragAssistant.h; sourceTree = "<group>"; };
-		A2082A8E09EAEB33009AC8BE /* PSMTabDragAssistant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PSMTabDragAssistant.m; path = source/PSMTabDragAssistant.m; sourceTree = "<group>"; wrapsLines = 0; };
-		A2129BAF09AEB58F00724E6C /* PSMProgressIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PSMProgressIndicator.h; path = source/PSMProgressIndicator.h; sourceTree = "<group>"; };
-		A2129BB009AEB58F00724E6C /* PSMProgressIndicator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PSMProgressIndicator.m; path = source/PSMProgressIndicator.m; sourceTree = "<group>"; };
-		A246FB040A2BD6F9005BDF7B /* PSMTabBarControlDoc.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html.documentation; name = PSMTabBarControlDoc.html; path = documentation/PSMTabBarControlDoc.html; sourceTree = "<group>"; };
-		A251BE810959A1B90058BC7F /* PSMOverflowPopUpButton.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = PSMOverflowPopUpButton.h; path = source/PSMOverflowPopUpButton.h; sourceTree = "<group>"; };
-		A251BE820959A1B90058BC7F /* PSMOverflowPopUpButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PSMOverflowPopUpButton.m; path = source/PSMOverflowPopUpButton.m; sourceTree = "<group>"; };
-		A251BE830959A1B90058BC7F /* PSMTabBarCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PSMTabBarCell.h; path = source/PSMTabBarCell.h; sourceTree = "<group>"; };
-		A251BE840959A1B90058BC7F /* PSMTabBarCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PSMTabBarCell.m; path = source/PSMTabBarCell.m; sourceTree = "<group>"; };
-		A251BE890959A1EA0058BC7F /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AppController.h; path = source/AppController.h; sourceTree = "<group>"; };
-		A251BE8A0959A1EA0058BC7F /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AppController.m; path = source/AppController.m; sourceTree = "<group>"; };
-		A251BE8B0959A1EA0058BC7F /* FakeModel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FakeModel.h; path = source/FakeModel.h; sourceTree = "<group>"; };
-		A251BE8C0959A1EA0058BC7F /* FakeModel.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FakeModel.m; path = source/FakeModel.m; sourceTree = "<group>"; };
-		A251BE8D0959A1EA0058BC7F /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = main.m; path = source/main.m; sourceTree = "<group>"; };
-		A251BE8F0959A23A0058BC7F /* 32x32cancel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 32x32cancel.png; path = images/32x32cancel.png; sourceTree = "<group>"; };
-		A251BE9B0959A2530058BC7F /* ReadMe.rtfd */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; path = ReadMe.rtfd; sourceTree = "<group>"; };
-		A251BEA20959BB5B0058BC7F /* TabBarControlDemo-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "TabBarControlDemo-Info.plist"; sourceTree = "<group>"; };
-		A251BEC30959BC0E0058BC7F /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
-		A268E7F809A9822900E082AA /* AquaTabNew.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabNew.png; path = images/AquaTabNew.png; sourceTree = "<group>"; };
-		A268E7F909A9822900E082AA /* AquaTabNewPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabNewPressed.png; path = images/AquaTabNewPressed.png; sourceTree = "<group>"; };
-		A268E7FA09A9822900E082AA /* AquaTabNewRollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabNewRollover.png; path = images/AquaTabNewRollover.png; sourceTree = "<group>"; };
-		A268E7FB09A9822900E082AA /* TabNewMetal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TabNewMetal.png; path = images/TabNewMetal.png; sourceTree = "<group>"; };
-		A268E7FC09A9822900E082AA /* TabNewMetalPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TabNewMetalPressed.png; path = images/TabNewMetalPressed.png; sourceTree = "<group>"; };
-		A268E7FD09A9822900E082AA /* TabNewMetalRollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TabNewMetalRollover.png; path = images/TabNewMetalRollover.png; sourceTree = "<group>"; };
-		A268EA5F09A9831800E082AA /* PSMRolloverButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PSMRolloverButton.h; path = source/PSMRolloverButton.h; sourceTree = "<group>"; };
-		A268EA6009A9831800E082AA /* PSMRolloverButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PSMRolloverButton.m; path = source/PSMRolloverButton.m; sourceTree = "<group>"; };
-		A269361009A778770006911E /* 32x32_log.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = 32x32_log.tiff; path = images/32x32_log.tiff; sourceTree = "<group>"; };
-		A2A711BA09E5AE1E00D0089B /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Window.nib; sourceTree = "<group>"; };
-		A2A711BD09E5BF0500D0089B /* WindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WindowController.h; path = source/WindowController.h; sourceTree = "<group>"; };
-		A2A711BE09E5BF0500D0089B /* WindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WindowController.m; path = source/WindowController.m; sourceTree = "<group>"; };
-		A2C0D99309AF870000ED379C /* pi.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pi.png; path = images/pi.png; sourceTree = "<group>"; };
-		A2D32EDA09A634C900EC8662 /* PSMTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PSMTabStyle.h; path = source/PSMTabStyle.h; sourceTree = "<group>"; };
-		A2D32EF009A63BF700EC8662 /* AquaTabClose_Front_Pressed.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = AquaTabClose_Front_Pressed.tif; path = images/AquaTabClose_Front_Pressed.tif; sourceTree = "<group>"; };
-		A2D32EF109A63BF700EC8662 /* AquaTabClose_Front_Rollover.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = AquaTabClose_Front_Rollover.tif; path = images/AquaTabClose_Front_Rollover.tif; sourceTree = "<group>"; };
-		A2D32EF209A63BF700EC8662 /* AquaTabClose_Front.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = AquaTabClose_Front.tif; path = images/AquaTabClose_Front.tif; sourceTree = "<group>"; };
-		A2D32EF309A63BF700EC8662 /* AquaTabsBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabsBackground.png; path = images/AquaTabsBackground.png; sourceTree = "<group>"; };
-		A2D32EF409A63BF700EC8662 /* AquaTabsDown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabsDown.png; path = images/AquaTabsDown.png; sourceTree = "<group>"; };
-		A2D32EF509A63BF700EC8662 /* AquaTabsSeparator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabsSeparator.png; path = images/AquaTabsSeparator.png; sourceTree = "<group>"; };
-		A2D32EF609A63BF700EC8662 /* AquaTabsSeparatorDown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabsSeparatorDown.png; path = images/AquaTabsSeparatorDown.png; sourceTree = "<group>"; };
-		A2D32EFE09A63D7A00EC8662 /* PSMMetalTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PSMMetalTabStyle.h; path = source/PSMMetalTabStyle.h; sourceTree = "<group>"; };
-		A2D32EFF09A63D7A00EC8662 /* PSMMetalTabStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PSMMetalTabStyle.m; path = source/PSMMetalTabStyle.m; sourceTree = "<group>"; };
-		A2D3317A09A68B7500EC8662 /* AquaTabsDownGraphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabsDownGraphite.png; path = images/AquaTabsDownGraphite.png; sourceTree = "<group>"; };
-		A2D3317B09A68B7500EC8662 /* AquaTabsDownNonKey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabsDownNonKey.png; path = images/AquaTabsDownNonKey.png; sourceTree = "<group>"; };
-		A2D98B070A2B432C0064C6F8 /* PSMUnifiedTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PSMUnifiedTabStyle.h; path = source/PSMUnifiedTabStyle.h; sourceTree = "<group>"; };
-		A2D98B080A2B432C0064C6F8 /* PSMUnifiedTabStyle.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PSMUnifiedTabStyle.m; path = source/PSMUnifiedTabStyle.m; sourceTree = "<group>"; };
-		A2D98B0F0A2B43FA0064C6F8 /* NSBezierPath_AMShading.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NSBezierPath_AMShading.h; path = source/NSBezierPath_AMShading.h; sourceTree = "<group>"; };
-		A2D98B100A2B43FA0064C6F8 /* NSBezierPath_AMShading.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NSBezierPath_AMShading.m; path = source/NSBezierPath_AMShading.m; sourceTree = "<group>"; };
-		DD92D38A0106425D02CA0E72 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		53DF68FB067E5B5A0090B5B0 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				13F8B89007B43554008AE28D /* Cocoa.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		0259C574FE90428111CA0C5A /* PSMTabBarControl */ = {
-			isa = PBXGroup;
-			children = (
-				A251BE9B0959A2530058BC7F /* ReadMe.rtfd */,
-				A246FADE0A2BD446005BDF7B /* Documentation */,
-				32DBCF9E0370C38000C91783 /* Palette */,
-				54D33B2C06778E4400C9C163 /* Framework */,
-				A251BE590959A0550058BC7F /* Demo App */,
-				0259C582FE90428111CA0C5A /* Resources */,
-				1ED78706FE9D4A0611CA0C5A /* Products */,
-				2E58F364FFB232C311CA0CBA /* Frameworks */,
-			);
-			name = PSMTabBarControl;
-			sourceTree = "<group>";
-		};
-		0259C582FE90428111CA0C5A /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				A251BEC20959BC0E0058BC7F /* MainMenu.nib */,
-				A251BE8E0959A21A0058BC7F /* Images */,
-				8D1AC9730486D14A00FE50C9 /* Info.plist */,
-				53DF68FE067E5B5A0090B5B0 /* PSMTabBarControlFramework-Info_legacy.plist */,
-				A251BEA20959BB5B0058BC7F /* TabBarControlDemo-Info.plist */,
-				8D1AC97F0486D23B00FE50C9 /* InfoPlist.strings */,
-				A2A711B909E5AE1E00D0089B /* Window.nib */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		131E8FE8067F80F40006E0CE /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				A20822EF0959F6AA00C5F5A4 /* TabControlRep.tif */,
-				A20822F00959F6AA00C5F5A4 /* TabIcon.tif */,
-				0259C57EFE90428111CA0C5A /* PSMTabBarControlInspector.nib */,
-				0259C580FE90428111CA0C5A /* PSMTabBarControlPalette.nib */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		13F8B6FD07B43410008AE28D /* Linked Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				13EB9DBD07DE0F1E00EB933A /* InterfaceBuilder.framework */,
-				DD92D38A0106425D02CA0E72 /* Cocoa.framework */,
-			);
-			name = "Linked Frameworks";
-			sourceTree = "<group>";
-		};
-		13F8B70407B43425008AE28D /* Other Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				13F8B88807B434F6008AE28D /* AppKit.framework */,
-				13F8B88A07B434F6008AE28D /* Foundation.framework */,
-			);
-			name = "Other Frameworks";
-			sourceTree = "<group>";
-		};
-		1ED78706FE9D4A0611CA0C5A /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				53DF68FD067E5B5A0090B5B0 /* PSMTabBarControl.framework */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		2E58F364FFB232C311CA0CBA /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				13F8B6FD07B43410008AE28D /* Linked Frameworks */,
-				13F8B70407B43425008AE28D /* Other Frameworks */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		32DBCF9E0370C38000C91783 /* Palette */ = {
-			isa = PBXGroup;
-			children = (
-				54D33B2406778DD400C9C163 /* Undo Support */,
-				54D33B2506778DF000C9C163 /* Classes */,
-				32DBCF9F0370C38200C91783 /* Other Sources */,
-				131E8FE8067F80F40006E0CE /* Resources */,
-				0259C583FE90428111CA0C5A /* palette.table */,
-			);
-			name = Palette;
-			sourceTree = "<group>";
-		};
-		32DBCF9F0370C38200C91783 /* Other Sources */ = {
-			isa = PBXGroup;
-			children = (
-				32DBCF980370C29C00C91783 /* PSMTabBarControl_Prefix.pch */,
-			);
-			name = "Other Sources";
-			sourceTree = "<group>";
-		};
-		54D33B2406778DD400C9C163 /* Undo Support */ = {
-			isa = PBXGroup;
-			children = (
-				54D33B2806778E3300C9C163 /* PSMTabBarControl.ibclassdescription */,
-			);
-			name = "Undo Support";
-			sourceTree = "<group>";
-		};
-		54D33B2506778DF000C9C163 /* Classes */ = {
-			isa = PBXGroup;
-			children = (
-				0259C57BFE90428111CA0C5A /* PSMTabBarControlInspector.h */,
-				0259C577FE90428111CA0C5A /* PSMTabBarControlInspector.m */,
-				0259C57CFE90428111CA0C5A /* PSMTabBarControlPalette.h */,
-				0259C578FE90428111CA0C5A /* PSMTabBarControlPalette.m */,
-			);
-			name = Classes;
-			sourceTree = "<group>";
-		};
-		54D33B2C06778E4400C9C163 /* Framework */ = {
-			isa = PBXGroup;
-			children = (
-				0259C57AFE90428111CA0C5A /* PSMTabBarControl.h */,
-				0259C576FE90428111CA0C5A /* PSMTabBarControl.m */,
-				A251BE830959A1B90058BC7F /* PSMTabBarCell.h */,
-				A251BE840959A1B90058BC7F /* PSMTabBarCell.m */,
-				A2D32EDA09A634C900EC8662 /* PSMTabStyle.h */,
-				A2D32EFE09A63D7A00EC8662 /* PSMMetalTabStyle.h */,
-				A2D32EFF09A63D7A00EC8662 /* PSMMetalTabStyle.m */,
-				A2D98B070A2B432C0064C6F8 /* PSMUnifiedTabStyle.h */,
-				A2D98B080A2B432C0064C6F8 /* PSMUnifiedTabStyle.m */,
-				A268EA5F09A9831800E082AA /* PSMRolloverButton.h */,
-				A268EA6009A9831800E082AA /* PSMRolloverButton.m */,
-				A251BE810959A1B90058BC7F /* PSMOverflowPopUpButton.h */,
-				A251BE820959A1B90058BC7F /* PSMOverflowPopUpButton.m */,
-				A2129BAF09AEB58F00724E6C /* PSMProgressIndicator.h */,
-				A2129BB009AEB58F00724E6C /* PSMProgressIndicator.m */,
-				A2082A8D09EAEB33009AC8BE /* PSMTabDragAssistant.h */,
-				A2082A8E09EAEB33009AC8BE /* PSMTabDragAssistant.m */,
-				A2D98B0F0A2B43FA0064C6F8 /* NSBezierPath_AMShading.h */,
-				A2D98B100A2B43FA0064C6F8 /* NSBezierPath_AMShading.m */,
-			);
-			name = Framework;
-			sourceTree = "<group>";
-		};
-		A246FADE0A2BD446005BDF7B /* Documentation */ = {
-			isa = PBXGroup;
-			children = (
-				A246FB040A2BD6F9005BDF7B /* PSMTabBarControlDoc.html */,
-			);
-			name = Documentation;
-			sourceTree = "<group>";
-		};
-		A251BE590959A0550058BC7F /* Demo App */ = {
-			isa = PBXGroup;
-			children = (
-				A251BE890959A1EA0058BC7F /* AppController.h */,
-				A251BE8A0959A1EA0058BC7F /* AppController.m */,
-				A2A711BD09E5BF0500D0089B /* WindowController.h */,
-				A2A711BE09E5BF0500D0089B /* WindowController.m */,
-				A251BE8B0959A1EA0058BC7F /* FakeModel.h */,
-				A251BE8C0959A1EA0058BC7F /* FakeModel.m */,
-				A251BE8D0959A1EA0058BC7F /* main.m */,
-			);
-			name = "Demo App";
-			sourceTree = "<group>";
-		};
-		A251BE8E0959A21A0058BC7F /* Images */ = {
-			isa = PBXGroup;
-			children = (
-				A2C0D99309AF870000ED379C /* pi.png */,
-				A2072B5C09AC1FA500304BCB /* Warning.png */,
-				A2072A2409ABD88600304BCB /* Folder.tif */,
-				A2072A2509ABD88600304BCB /* Globe.tiff */,
-				A268E7F809A9822900E082AA /* AquaTabNew.png */,
-				A268E7F909A9822900E082AA /* AquaTabNewPressed.png */,
-				A268E7FA09A9822900E082AA /* AquaTabNewRollover.png */,
-				A268E7FB09A9822900E082AA /* TabNewMetal.png */,
-				523897F115BDA9AC00498A53 /* TabNewMetal@2x.png */,
-				A268E7FC09A9822900E082AA /* TabNewMetalPressed.png */,
-				523897F215BDA9AC00498A53 /* TabNewMetalPressed@2x.png */,
-				A268E7FD09A9822900E082AA /* TabNewMetalRollover.png */,
-				523897F315BDA9AC00498A53 /* TabNewMetalRollover@2x.png */,
-				A269361009A778770006911E /* 32x32_log.tiff */,
-				A2D3317A09A68B7500EC8662 /* AquaTabsDownGraphite.png */,
-				A2D3317B09A68B7500EC8662 /* AquaTabsDownNonKey.png */,
-				A2D32EF009A63BF700EC8662 /* AquaTabClose_Front_Pressed.tif */,
-				A2D32EF109A63BF700EC8662 /* AquaTabClose_Front_Rollover.tif */,
-				A2D32EF209A63BF700EC8662 /* AquaTabClose_Front.tif */,
-				A2D32EF309A63BF700EC8662 /* AquaTabsBackground.png */,
-				A2D32EF409A63BF700EC8662 /* AquaTabsDown.png */,
-				A2D32EF509A63BF700EC8662 /* AquaTabsSeparator.png */,
-				A2D32EF609A63BF700EC8662 /* AquaTabsSeparatorDown.png */,
-				A251BE8F0959A23A0058BC7F /* 32x32cancel.png */,
-				52C268CE15BDB72B0012FECA /* overflowImage.png */,
-				52C0B9B215BDB7A9000C268F /* overflowImage@2x.png */,
-				52C268CF15BDB72B0012FECA /* overflowImagePressed.png */,
-				52C0B9B315BDB7A9000C268F /* overflowImagePressed@2x.png */,
-				52A57C0C15BBA230003EC59C /* TabClose_Front.png */,
-				523897F015BDA9AC00498A53 /* TabClose_Front@2x.png */,
-				52A57C0D15BBA230003EC59C /* TabClose_Front_Pressed.png */,
-				523897EE15BDA9AC00498A53 /* TabClose_Front_Pressed@2x.png */,
-				52A57C0E15BBA230003EC59C /* TabClose_Front_Rollover.png */,
-				523897EF15BDA9AC00498A53 /* TabClose_Front_Rollover@2x.png */,
-			);
-			name = Images;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		53DF68F8067E5B5A0090B5B0 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				546DEAF2067F630E0098DCC4 /* PSMTabBarControl.h in Headers */,
-				A251BE850959A1B90058BC7F /* PSMOverflowPopUpButton.h in Headers */,
-				A251BE870959A1B90058BC7F /* PSMTabBarCell.h in Headers */,
-				A2D32EDC09A634C900EC8662 /* PSMTabStyle.h in Headers */,
-				A2D32F0009A63D7A00EC8662 /* PSMMetalTabStyle.h in Headers */,
-				A268EA6209A9831800E082AA /* PSMRolloverButton.h in Headers */,
-				A2129BB209AEB58F00724E6C /* PSMProgressIndicator.h in Headers */,
-				A2082A9009EAEB34009AC8BE /* PSMTabDragAssistant.h in Headers */,
-				A2D98B0A0A2B432C0064C6F8 /* PSMUnifiedTabStyle.h in Headers */,
-				A2D98B120A2B43FA0064C6F8 /* NSBezierPath_AMShading.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		53DF68FC067E5B5A0090B5B0 /* PSMTabBarControlFramework */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = C056397F08A954F8003078D8 /* Build configuration list for PBXNativeTarget "PSMTabBarControlFramework" */;
-			buildPhases = (
-				53DF68F8067E5B5A0090B5B0 /* Headers */,
-				53DF68F9067E5B5A0090B5B0 /* Resources */,
-				53DF68FA067E5B5A0090B5B0 /* Sources */,
-				53DF68FB067E5B5A0090B5B0 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = PSMTabBarControlFramework;
-			productName = PSMTabBarControlFramework;
-			productReference = 53DF68FD067E5B5A0090B5B0 /* PSMTabBarControl.framework */;
-			productType = "com.apple.product-type.framework";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		0259C573FE90428111CA0C5A /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = C056398B08A954F8003078D8 /* Build configuration list for PBXProject "PSMTabBarControl" */;
-			compatibilityVersion = "Xcode 2.4";
-			developmentRegion = English;
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				en,
-			);
-			mainGroup = 0259C574FE90428111CA0C5A /* PSMTabBarControl */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				53DF68FC067E5B5A0090B5B0 /* PSMTabBarControlFramework */,
-				53DF6901067E5B8E0090B5B0 /* All */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		53DF68F9067E5B5A0090B5B0 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				A2D32EF709A63BF700EC8662 /* AquaTabClose_Front_Pressed.tif in Resources */,
-				A2D32EF809A63BF700EC8662 /* AquaTabClose_Front_Rollover.tif in Resources */,
-				A2D32EF909A63BF700EC8662 /* AquaTabClose_Front.tif in Resources */,
-				A2D32EFA09A63BF700EC8662 /* AquaTabsBackground.png in Resources */,
-				A2D32EFB09A63BF700EC8662 /* AquaTabsDown.png in Resources */,
-				A2D32EFC09A63BF700EC8662 /* AquaTabsSeparator.png in Resources */,
-				A2D32EFD09A63BF700EC8662 /* AquaTabsSeparatorDown.png in Resources */,
-				A2D3317C09A68B7500EC8662 /* AquaTabsDownGraphite.png in Resources */,
-				A2D3317D09A68B7500EC8662 /* AquaTabsDownNonKey.png in Resources */,
-				A268E80409A9822A00E082AA /* AquaTabNew.png in Resources */,
-				A268E80509A9822A00E082AA /* AquaTabNewPressed.png in Resources */,
-				A268E80609A9822A00E082AA /* AquaTabNewRollover.png in Resources */,
-				A268E80709A9822A00E082AA /* TabNewMetal.png in Resources */,
-				A268E80809A9822A00E082AA /* TabNewMetalPressed.png in Resources */,
-				A268E80909A9822A00E082AA /* TabNewMetalRollover.png in Resources */,
-				A2C0D99509AF870000ED379C /* pi.png in Resources */,
-				A27E47850A28EE76007BA395 /* TabIcon.tif in Resources */,
-				A27E47880A28EE7C007BA395 /* TabControlRep.tif in Resources */,
-				52A57C0F15BBA230003EC59C /* TabClose_Front.png in Resources */,
-				52A57C1015BBA230003EC59C /* TabClose_Front_Pressed.png in Resources */,
-				52A57C1115BBA230003EC59C /* TabClose_Front_Rollover.png in Resources */,
-				523897F415BDA9AC00498A53 /* TabClose_Front_Pressed@2x.png in Resources */,
-				523897F515BDA9AC00498A53 /* TabClose_Front_Rollover@2x.png in Resources */,
-				523897F615BDA9AC00498A53 /* TabClose_Front@2x.png in Resources */,
-				523897F715BDA9AC00498A53 /* TabNewMetal@2x.png in Resources */,
-				523897F815BDA9AC00498A53 /* TabNewMetalPressed@2x.png in Resources */,
-				523897F915BDA9AC00498A53 /* TabNewMetalRollover@2x.png in Resources */,
-				52C268D015BDB72B0012FECA /* overflowImage.png in Resources */,
-				52C268D115BDB72B0012FECA /* overflowImagePressed.png in Resources */,
-				52C0B9B415BDB7A9000C268F /* overflowImage@2x.png in Resources */,
-				52C0B9B515BDB7A9000C268F /* overflowImagePressed@2x.png in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		53DF68FA067E5B5A0090B5B0 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				546DEAF1067F63070098DCC4 /* PSMTabBarControl.m in Sources */,
-				A251BE860959A1B90058BC7F /* PSMOverflowPopUpButton.m in Sources */,
-				A251BE880959A1B90058BC7F /* PSMTabBarCell.m in Sources */,
-				A2D32F0109A63D7A00EC8662 /* PSMMetalTabStyle.m in Sources */,
-				A268EA6309A9831800E082AA /* PSMRolloverButton.m in Sources */,
-				A2129BB309AEB58F00724E6C /* PSMProgressIndicator.m in Sources */,
-				A2082A9109EAEB34009AC8BE /* PSMTabDragAssistant.m in Sources */,
-				A2D98B0B0A2B432C0064C6F8 /* PSMUnifiedTabStyle.m in Sources */,
-				A2D98B130A2B43FA0064C6F8 /* NSBezierPath_AMShading.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		53DF6905067E5B930090B5B0 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 53DF68FC067E5B5A0090B5B0 /* PSMTabBarControlFramework */;
-			targetProxy = 53DF6904067E5B930090B5B0 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		0259C57EFE90428111CA0C5A /* PSMTabBarControlInspector.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				0259C57FFE90428111CA0C5A /* English */,
-			);
-			name = PSMTabBarControlInspector.nib;
-			sourceTree = "<group>";
-		};
-		0259C580FE90428111CA0C5A /* PSMTabBarControlPalette.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				0259C581FE90428111CA0C5A /* English */,
-			);
-			name = PSMTabBarControlPalette.nib;
-			sourceTree = "<group>";
-		};
-		8D1AC97F0486D23B00FE50C9 /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				8D1AC97B0486D23100FE50C9 /* English */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		A251BEC20959BC0E0058BC7F /* MainMenu.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				A251BEC30959BC0E0058BC7F /* English */,
-			);
-			name = MainMenu.nib;
-			sourceTree = "<group>";
-		};
-		A2A711B909E5AE1E00D0089B /* Window.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				A2A711BA09E5AE1E00D0089B /* English */,
-			);
-			name = Window.nib;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		C056398008A954F8003078D8 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
-				COPY_PHASE_STRIP = NO;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				FRAMEWORK_VERSION = A;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-				GCC_VERSION = "";
-				INFOPLIST_FILE = "PSMTabBarControlFramework-Info_legacy.plist";
-				INSTALL_PATH = "@executable_path/../Frameworks";
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = "";
-				PRODUCT_NAME = PSMTabBarControl;
-				SYMROOT = ../build;
-				ZERO_LINK = NO;
-			};
-			name = Debug;
-		};
-		C056398108A954F8003078D8 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				FRAMEWORK_VERSION = A;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-				GCC_VERSION = "";
-				INFOPLIST_FILE = "PSMTabBarControlFramework-Info_legacy.plist";
-				INSTALL_PATH = "@executable_path/../Frameworks";
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = "";
-				PRODUCT_NAME = PSMTabBarControl;
-				SYMROOT = ../build;
-			};
-			name = Release;
-		};
-		C056398808A954F8003078D8 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				PRODUCT_NAME = All;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				ZERO_LINK = YES;
-			};
-			name = Debug;
-		};
-		C056398908A954F8003078D8 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
-				PRODUCT_NAME = All;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
-			name = Release;
-		};
-		C056398C08A954F8003078D8 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				SYMROOT = ../build;
-			};
-			name = Debug;
-		};
-		C056398D08A954F8003078D8 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				SYMROOT = ../build;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		C056397F08A954F8003078D8 /* Build configuration list for PBXNativeTarget "PSMTabBarControlFramework" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C056398008A954F8003078D8 /* Debug */,
-				C056398108A954F8003078D8 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		C056398708A954F8003078D8 /* Build configuration list for PBXAggregateTarget "All" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C056398808A954F8003078D8 /* Debug */,
-				C056398908A954F8003078D8 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		C056398B08A954F8003078D8 /* Build configuration list for PBXProject "PSMTabBarControl" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C056398C08A954F8003078D8 /* Debug */,
-				C056398D08A954F8003078D8 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 0259C573FE90428111CA0C5A /* Project object */;
-}

src/MacVim/blur.h

@@ -1,3 +0,0 @@
-#if defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
-# define BLUR_TRANSPARENCY
-#endif

src/MacVim/gui_macvim.m

@@ -182,6 +182,10 @@ gui_macvim_after_fork_init()
         keyValid = YES;
         val = MMRendererCoreText;
     }
+    if (val != MMRendererDefault && val != MMRendererCoreText) {
+        // Migrate from the old value to the Core Text Renderer.
+        val = MMRendererCoreText;
+    }
     if (keyValid) {
         ASLogInfo(@"Use renderer=%ld", val);
         use_gui_macvim_draw_string = (val != MMRendererCoreText);
@@ -2371,12 +2375,8 @@ gui_mch_post_balloon(beval, mesg)
 
 #endif // FEAT_BEVAL
 
-#ifdef BLUR_TRANSPARENCY
-
     void
 gui_macvim_set_blur(int radius)
 {
     [[MMBackend sharedInstance] setBlurRadius:radius];
 }
-
-#endif // BLUR_TRANSPARENCY

src/option.c

@@ -657,11 +657,7 @@ static struct vimoption
 #endif
 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
     {"blurradius",  "blur", P_NUM|P_VIM,
-#ifdef BLUR_TRANSPARENCY
 			    (char_u *)&p_blur, PV_NONE,
-#else
-			    (char_u *)NULL, PV_NONE,
-#endif
 			    {(char_u *)0L, (char_u *)0L} },
     {"bomb",	    NULL,   P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT,
 #ifdef FEAT_MBYTE
@@ -8941,7 +8937,6 @@ set_num_option(opt_idx, varp, value, errbuf, errbuflen, opt_flags)
     }
 #endif
 
-#ifdef BLUR_TRANSPARENCY
     else if (pp == &p_blur)
     {
         if (p_blur < 0)
@@ -8954,7 +8949,6 @@ set_num_option(opt_idx, varp, value, errbuf, errbuflen, opt_flags)
             gui_macvim_set_blur(p_blur);
         }
     }
-#endif
 
     else if (pp == &curbuf->b_p_tw)
     {

src/option.h

@@ -870,9 +870,7 @@ EXTERN char_u	*p_tsr;		/* 'thesaurus' */
 #ifdef FEAT_TRANSPARENCY
 EXTERN long     p_transp;       /* 'transparency' */
 #endif
-#ifdef BLUR_TRANSPARENCY
 EXTERN long     p_blur;         /* 'blurradius' */
-#endif
 EXTERN int	p_ttimeout;	/* 'ttimeout' */
 EXTERN long	p_ttm;		/* 'ttimeoutlen' */
 EXTERN int	p_tbi;		/* 'ttybuiltin' */

src/proto/gui_macvim.pro

@@ -208,10 +208,7 @@ void gui_macvim_update_modified_flag();
 void gui_macvim_add_to_find_pboard(char_u *pat);
 void gui_macvim_set_antialias(int antialias);
 void gui_macvim_set_ligatures(int ligatures);
-
-#ifdef BLUR_TRANSPARENCY
 void gui_macvim_set_blur(int blur);
-#endif
 
 int16_t odb_buffer_close(buf_T *buf);
 int16_t odb_post_buffer_write(buf_T *buf);

src/vim.h

@@ -1751,11 +1751,6 @@ typedef struct timeval proftime_T;
 typedef int proftime_T;	    /* dummy for function prototypes */
 #endif
 
-/* Needs to be before option.h, which uses BLUR_TRANSPARENCY */
-#ifdef FEAT_TRANSPARENCY
-# include "MacVim/blur.h"
-#endif
-
 /* Include option.h before structs.h, because the number of window-local and
  * buffer-local options is used there. */
 #include "option.h"	    /* options and default values */