Skip to content

Commit abb115b

Browse files
committed
Fix MacVim source code to not use the removed EMSG macros in Vim
1 parent 0d15f19 commit abb115b

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/MacVim/MMBackend.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1529,7 +1529,7 @@ - (BOOL)sendToServer:(NSString *)name string:(NSString *)string
15291529
#ifdef FEAT_MBYTE
15301530
s = CONVERT_FROM_UTF8(s);
15311531
#endif
1532-
EMSG2(_(e_noserver), s);
1532+
semsg(_(e_noserver), s);
15331533
#ifdef FEAT_MBYTE
15341534
CONVERT_FROM_UTF8_FREE(s);
15351535
#endif

src/MacVim/gui_macvim.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,7 @@
989989
return font;
990990

991991
if (giveErrorIfMissing)
992-
EMSG2(_(e_font), name);
992+
semsg(_(e_font), name);
993993

994994
return NOFONT;
995995
}
@@ -1428,7 +1428,7 @@
14281428
exarg_T *eap;
14291429
{
14301430
if (!gui.in_use) {
1431-
EMSG(_("E???: Command only available in GUI mode"));
1431+
emsg(_("E???: Command only available in GUI mode"));
14321432
return;
14331433
}
14341434

@@ -1442,7 +1442,7 @@
14421442
if (actionDict && [actionDict objectForKey:name] != nil) {
14431443
[[MMBackend sharedInstance] executeActionWithName:name];
14441444
} else {
1445-
EMSG2(_("E???: Invalid action: %s"), eap->arg);
1445+
semsg(_("E???: Invalid action: %s"), eap->arg);
14461446
}
14471447

14481448
#ifdef FEAT_MBYTE
@@ -2053,7 +2053,7 @@
20532053

20542054
sscanf((char *)str, "0x%x", &port);
20552055
if (!port)
2056-
EMSG2(_("E573: Invalid server id used: %s"), str);
2056+
semsg(_("E573: Invalid server id used: %s"), str);
20572057

20582058
return port;
20592059
}
@@ -2434,7 +2434,7 @@
24342434
NSString *imgName = [NSString stringWithVimString:signfile];
24352435
NSImage *img = [[NSImage alloc] initWithContentsOfFile:imgName];
24362436
if (!img) {
2437-
EMSG(_(e_signdata));
2437+
emsg(_(e_signdata));
24382438
return NULL;
24392439
}
24402440

0 commit comments

Comments
 (0)