diff --git a/Actions.plist b/Actions.plist index 3f8093cd06..54981e1765 100644 --- a/Actions.plist +++ b/Actions.plist @@ -12,7 +12,7 @@ miniaturizeAll: - newVimWindow: + newWindow: orderFrontCharacterPalette: diff --git a/English.lproj/MainMenu.nib/classes.nib b/English.lproj/MainMenu.nib/classes.nib index cc058adef0..72ef18a17f 100644 --- a/English.lproj/MainMenu.nib/classes.nib +++ b/English.lproj/MainMenu.nib/classes.nib @@ -13,7 +13,7 @@ SUPERCLASS = NSObject; }, { - ACTIONS = {newVimWindow = id; }; + ACTIONS = {newWindow = id; selectNextWindow = id; selectPreviousWindow = id; }; CLASS = MMAppController; LANGUAGE = ObjC; SUPERCLASS = NSObject; diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib index 8bbeff5912..b61013f5ee 100644 Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/MMAppController.h b/MMAppController.h index 55d412a0f5..bc1bf6b09e 100644 --- a/MMAppController.h +++ b/MMAppController.h @@ -22,7 +22,7 @@ - (void)removeVimController:(id)controller; - (void)windowControllerWillOpen:(MMWindowController *)windowController; -- (IBAction)newVimWindow:(id)sender; +- (IBAction)newWindow:(id)sender; - (IBAction)selectNextWindow:(id)sender; - (IBAction)selectPreviousWindow:(id)sender; diff --git a/MMAppController.m b/MMAppController.m index 0a74902a06..cc28797b9d 100644 --- a/MMAppController.m +++ b/MMAppController.m @@ -124,7 +124,7 @@ static NSTimeInterval MMTerminateTimeout = 3; { //NSLog(@"%s NSapp=%@ theApp=%@", _cmd, NSApp, sender); - [self newVimWindow:self]; + [self newWindow:self]; return YES; } @@ -347,7 +347,7 @@ static NSTimeInterval MMTerminateTimeout = 3; } } -- (IBAction)newVimWindow:(id)sender +- (IBAction)newWindow:(id)sender { NSMutableArray *args = [NSMutableArray arrayWithObject:@"-g"]; NSString *path = [[NSBundle mainBundle] @@ -477,7 +477,7 @@ static NSTimeInterval MMTerminateTimeout = 3; if (openSelectionString) [openSelectionString release]; openSelectionString = [[pboard stringForType:NSStringPboardType] copy]; - [self newVimWindow:self]; + [self newWindow:self]; } } diff --git a/gvimrc b/gvimrc index 043f44b50f..47f5399d93 100644 --- a/gvimrc +++ b/gvimrc @@ -40,7 +40,7 @@ aunmenu File.-SEP4- aunmenu File.Exit aunmenu File.Save-Exit -an 10.290 File.New\ Window :action newVimWindow: +an 10.290 File.New\ Window :action newWindow: an 10.295 File.New\ Tab :tabnew an 10.328 File.-SEP0- an 10.330 File.Close\ Window:qa :confirm qa