Code cleanup

git-svn-id: http://macvim.googlecode.com/svn/trunk@188 96c4425d-ca35-0410-94e5-3396d5c13a8f
This commit is contained in:
Bjorn Winckler
2007-08-24 08:09:46 +00:00
parent c8e1fb4fc2
commit 1cd2bc7548
5 changed files with 6 additions and 22 deletions
-2
View File
@@ -17,10 +17,8 @@
NSMutableData *drawData;
NSConnection *connection;
id frontendProxy;
NSString *browseForFileString;
NSDictionary *colorDict;
BOOL inputReceived;
BOOL receivedKillTaskMsg;
BOOL tabBarVisible;
int backgroundColor;
int foregroundColor;
+1 -7
View File
@@ -895,13 +895,7 @@ static int specialKeyToNSKey(int key);
- (void)handleMessage:(int)msgid data:(NSData *)data
{
if (KillTaskMsgID == msgid) {
//NSLog(@"VimTask received kill message; exiting now.");
// Set this flag here so that exit does not send TaskExitedMsgID back
// to MMVimController.
receivedKillTaskMsg = YES;
getout(0);
} else if (InsertTextMsgID == msgid) {
if (InsertTextMsgID == msgid) {
if (!data) return;
NSString *key = [[NSString alloc] initWithData:data
encoding:NSUTF8StringEncoding];
+1 -5
View File
@@ -75,11 +75,7 @@
extern char *MessageStrings[];
enum {
CheckinMsgID = 1,
ConnectedMsgID,
KillTaskMsgID,
TaskExitedMsgID,
OpenVimWindowMsgID,
OpenVimWindowMsgID = 1,
InsertTextMsgID,
KeyDownMsgID,
CmdKeyMsgID,
-4
View File
@@ -13,10 +13,6 @@
char *MessageStrings[] =
{
"INVALID MESSAGE ID",
"CheckinMsgID",
"ConnectedMsgID",
"KillTaskMsgID",
"TaskExitedMsgID",
"OpenVimWindowMsgID",
"InsertTextMsgID",
"KeyDownMsgID",
+4 -4
View File
@@ -14,7 +14,7 @@
#import "vim.h"
static BOOL gui_cocoa_is_valid_action(NSString *action);
static BOOL gui_macvim_is_valid_action(NSString *action);
// -- Initialization --------------------------------------------------------
@@ -641,7 +641,7 @@ gui_mch_add_menu_item(vimmenu_T *menu, int idx)
action = [parts objectAtIndex:1];
action = [action stringByTrimmingCharactersInSet:
[NSCharacterSet whitespaceAndNewlineCharacterSet]];
if (!gui_cocoa_is_valid_action(action))
if (!gui_macvim_is_valid_action(action))
action = nil;
}
}
@@ -925,7 +925,7 @@ ex_action(eap)
NSString *name = [NSString stringWithCString:(char*)eap->arg
encoding:NSUTF8StringEncoding];
if (gui_cocoa_is_valid_action(name)) {
if (gui_macvim_is_valid_action(name)) {
[[MMBackend sharedInstance] executeActionWithName:name];
} else {
EMSG2(_("E???: \"%s\" is not a valid action"), eap->arg);
@@ -1301,7 +1301,7 @@ mch_set_mouse_shape(int shape)
static BOOL
gui_cocoa_is_valid_action(NSString *action)
gui_macvim_is_valid_action(NSString *action)
{
static NSDictionary *actionDict = nil;