diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-07-08 10:46:08 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-07-08 10:46:08 +0000 |
| commit | c93e791042297f4e48c0ae0c61e0ad6c9434c032 (patch) | |
| tree | efc917bba38d6812d67386b53108c2799ae53b84 | |
| parent | 3a847972c3e15a491d9d33f7c192d7c171896078 (diff) | |
| download | vim-git-c93e791042297f4e48c0ae0c61e0ad6c9434c032.tar.gz | |
updated for version 7.2a-018v7.2a.018
| -rw-r--r-- | src/gui_gtk_x11.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 741b733d7..dc95d818a 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -22,6 +22,7 @@ */ #include "vim.h" + #ifdef FEAT_GUI_GNOME /* Gnome redefines _() and N_(). Grrr... */ # ifdef _ @@ -1592,7 +1593,7 @@ gui_mch_init_check(void) if (!gtk_init_check(&gui_argc, &gui_argv)) { gui.dying = TRUE; - EMSG(_(e_opendisp)); + EMSG(_((char *)e_opendisp)); return FAIL; } @@ -2345,9 +2346,9 @@ sm_client_die(GnomeClient *client, gpointer data) /* Don't write messages to the GUI anymore */ full_screen = FALSE; - vim_strncpy(IObuff, + vim_strncpy(IObuff, (char_u *) _("Vim: Received \"die\" request from session manager\n"), - IOSIZE - 1); + IOSIZE - 1); preserve_exit(); } @@ -5244,7 +5245,7 @@ gui_mch_get_font(char_u *name, int report_error) if (font == NULL) { if (report_error) - EMSG2(_(e_font), name); + EMSG2(_((char *)e_font), name); return NULL; } diff --git a/src/version.c b/src/version.c index 11abe51aa..ec51a6cce 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 18, +/**/ 17, /**/ 16, |