Mirror of the Vim source from https://github.com/vim/vim
リビジョン | e1d77e652cb7f9e84072f16b3ac6dcbb73a1fd81 (tree) |
---|---|
日時 | 2008-07-08 19:46:08 |
作者 | vimboss |
コミッター | vimboss |
updated for version 7.2a-018
@@ -22,6 +22,7 @@ | ||
22 | 22 | */ |
23 | 23 | |
24 | 24 | #include "vim.h" |
25 | + | |
25 | 26 | #ifdef FEAT_GUI_GNOME |
26 | 27 | /* Gnome redefines _() and N_(). Grrr... */ |
27 | 28 | # ifdef _ |
@@ -1592,7 +1593,7 @@ | ||
1592 | 1593 | if (!gtk_init_check(&gui_argc, &gui_argv)) |
1593 | 1594 | { |
1594 | 1595 | gui.dying = TRUE; |
1595 | - EMSG(_(e_opendisp)); | |
1596 | + EMSG(_((char *)e_opendisp)); | |
1596 | 1597 | return FAIL; |
1597 | 1598 | } |
1598 | 1599 |
@@ -2345,9 +2346,9 @@ | ||
2345 | 2346 | /* Don't write messages to the GUI anymore */ |
2346 | 2347 | full_screen = FALSE; |
2347 | 2348 | |
2348 | - vim_strncpy(IObuff, | |
2349 | + vim_strncpy(IObuff, (char_u *) | |
2349 | 2350 | _("Vim: Received \"die\" request from session manager\n"), |
2350 | - IOSIZE - 1); | |
2351 | + IOSIZE - 1); | |
2351 | 2352 | preserve_exit(); |
2352 | 2353 | } |
2353 | 2354 |
@@ -5244,7 +5245,7 @@ | ||
5244 | 5245 | if (font == NULL) |
5245 | 5246 | { |
5246 | 5247 | if (report_error) |
5247 | - EMSG2(_(e_font), name); | |
5248 | + EMSG2(_((char *)e_font), name); | |
5248 | 5249 | return NULL; |
5249 | 5250 | } |
5250 | 5251 |
@@ -677,6 +677,8 @@ | ||
677 | 677 | static int included_patches[] = |
678 | 678 | { /* Add new patch number below this line */ |
679 | 679 | /**/ |
680 | + 18, | |
681 | +/**/ | |
680 | 682 | 17, |
681 | 683 | /**/ |
682 | 684 | 16, |