thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.2a-018

Browse Source
This commit is contained in:
Bram Moolenaar
2008-07-08 10:46:08 +00:00
parent 3a847972c3
commit c93e791042
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui_gtk_x11.c
View File

@@ -22,6 +22,7 @@
*/ */
#include "vim.h" #include "vim.h"
#ifdef FEAT_GUI_GNOME #ifdef FEAT_GUI_GNOME
/* Gnome redefines _() and N_(). Grrr... */ /* Gnome redefines _() and N_(). Grrr... */
# ifdef _ # ifdef _
@@ -1592,7 +1593,7 @@ gui_mch_init_check(void)
if (!gtk_init_check(&gui_argc, &gui_argv)) if (!gtk_init_check(&gui_argc, &gui_argv))
{ {
gui.dying = TRUE; gui.dying = TRUE;
EMSG(_(e_opendisp)); EMSG(_((char *)e_opendisp));
return FAIL; return FAIL;
} }
@@ -2345,9 +2346,9 @@ sm_client_die(GnomeClient *client, gpointer data)
/* Don't write messages to the GUI anymore */ /* Don't write messages to the GUI anymore */
full_screen = FALSE; full_screen = FALSE;
vim_strncpy(IObuff, vim_strncpy(IObuff, (char_u *)
_("Vim: Received \"die\" request from session manager\n"), _("Vim: Received \"die\" request from session manager\n"),
IOSIZE - 1); IOSIZE - 1);
preserve_exit(); preserve_exit();
} }
@@ -5244,7 +5245,7 @@ gui_mch_get_font(char_u *name, int report_error)
if (font == NULL) if (font == NULL)
{ {
if (report_error) if (report_error)
EMSG2(_(e_font), name); EMSG2(_((char *)e_font), name);
return NULL; return NULL;
} }

2
src/version.c
View File

@@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
18,
/**/ /**/
17, 17,
/**/ /**/