diff --git a/src/MacVim/Actions.plist b/src/MacVim/Actions.plist index 1d6b1a1b88..83aa78c124 100644 --- a/src/MacVim/Actions.plist +++ b/src/MacVim/Actions.plist @@ -26,8 +26,6 @@ fontSizeUp: - forceNewWindow: - hide: hideOtherApplications: diff --git a/src/MacVim/English.lproj/MainMenu.nib/classes.nib b/src/MacVim/English.lproj/MainMenu.nib/classes.nib index 7f881f3dd6..9399a92169 100644 --- a/src/MacVim/English.lproj/MainMenu.nib/classes.nib +++ b/src/MacVim/English.lproj/MainMenu.nib/classes.nib @@ -60,6 +60,14 @@ SUPERCLASS NSView + + CLASS + NSMenu + LANGUAGE + ObjC + SUPERCLASS + NSObject + ACTIONS @@ -77,14 +85,6 @@ SUPERCLASS NSObject - - CLASS - NSMenu - LANGUAGE - ObjC - SUPERCLASS - NSObject - ACTIONS diff --git a/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib b/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib index 0a71a9b296..f22a283c33 100644 Binary files a/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib and b/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/src/MacVim/MMAppController.h b/src/MacVim/MMAppController.h index 4a8481221b..a7fea15a4c 100644 --- a/src/MacVim/MMAppController.h +++ b/src/MacVim/MMAppController.h @@ -50,7 +50,6 @@ - (void)setPreloadCacheSize:(int)size; - (IBAction)newWindow:(id)sender; -- (IBAction)forceNewWindow:(id)sender; - (IBAction)fileOpen:(id)sender; - (IBAction)selectNextWindow:(id)sender; - (IBAction)selectPreviousWindow:(id)sender; diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m index 2f09b67c05..fc7277e876 100644 --- a/src/MacVim/MMAppController.m +++ b/src/MacVim/MMAppController.m @@ -849,16 +849,6 @@ static int executeInLoginShell(NSString *path, NSArray *args); } } -- (IBAction)forceNewWindow:(id)sender -{ - // Open a new window, but clear the preload cache first so that any - // subsequent windows opening will have sourced the current .[g]vimrc - // files. - [self clearPreloadCacheWithCount:-1]; - [self launchVimProcessWithArguments:nil]; - [self scheduleVimControllerPreloadAfterDelay:2.0]; -} - - (IBAction)fileOpen:(id)sender { NSString *dir = nil; diff --git a/src/MacVim/gvimrc b/src/MacVim/gvimrc index c4cc2be059..ea46db82b9 100644 --- a/src/MacVim/gvimrc +++ b/src/MacVim/gvimrc @@ -1,7 +1,7 @@ " System gvimrc file for MacVim " " Maintainer: Bjorn Winckler -" Last Change: Sat Jul 05 2008 +" Last Change: Sun Aug 03 2008 " " This is a work in progress. If you feel so inclined, please help me improve " this file. @@ -48,7 +48,6 @@ aunmenu File.Exit aunmenu File.Save-Exit an 10.290 File.New\ Window -an 10.291 File.Force\ New\ Window an 10.295 File.New\ Tab :tabnew an 10.310 File.Open\.\.\. an 10.325 File.Open\ Recent @@ -206,7 +205,6 @@ endif " exists("macvim_hig_shift_movement") " macm File.New\ Window key= action=newWindow: -macm File.Force\ New\ Window key= action=forceNewWindow: alt=YES macm File.New\ Tab key= macm File.Open\.\.\. key= action=fileOpen: macm File.Open\ Tab\.\.\. key=