To:
[email protected]
Subject: Patch 7.2a.018
Fcc: outbox
From: Bram Moolenaar <
[email protected]>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.2a.018
Problem: Compiler warnings when compiling with Gnome. (Tony Mechelynck)
Solution: Add type casts.
Files: src/gui_gtk_x11.c
*** ../vim-7.2a.017/src/gui_gtk_x11.c Wed Jul 2 21:04:36 2008
--- src/gui_gtk_x11.c Fri Jul 4 12:46:24 2008
***************
*** 22,27 ****
--- 22,28 ----
*/
#include "vim.h"
+
#ifdef FEAT_GUI_GNOME
/* Gnome redefines _() and N_(). Grrr... */
# ifdef _
***************
*** 1592,1598 ****
if (!gtk_init_check(&gui_argc, &gui_argv))
{
gui.dying = TRUE;
! EMSG(_(e_opendisp));
return FAIL;
}
--- 1593,1599 ----
if (!gtk_init_check(&gui_argc, &gui_argv))
{
gui.dying = TRUE;
! EMSG(_((char *)e_opendisp));
return FAIL;
}
***************
*** 2345,2353 ****
/* Don't write messages to the GUI anymore */
full_screen = FALSE;
! vim_strncpy(IObuff,
_("Vim: Received \"die\" request from session manager\n"),
! IOSIZE - 1);
preserve_exit();
}
--- 2346,2354 ----
/* Don't write messages to the GUI anymore */
full_screen = FALSE;
! vim_strncpy(IObuff, (char_u *)
_("Vim: Received \"die\" request from session manager\n"),
! IOSIZE - 1);
preserve_exit();
}
***************
*** 5244,5250 ****
if (font == NULL)
{
if (report_error)
! EMSG2(_(e_font), name);
return NULL;
}
--- 5245,5251 ----
if (font == NULL)
{
if (report_error)
! EMSG2(_((char *)e_font), name);
return NULL;
}
*** ../vim-7.2a.017/src/version.c Tue Jul 8 11:36:02 2008
--- src/version.c Tue Jul 8 12:44:06 2008
***************
*** 678,679 ****
--- 678,681 ----
{ /* Add new patch number below this line */
+ /**/
+ 18,
/**/
--
hundred-and-one symptoms of being an internet addict:
183. You move your coffeemaker next to your computer.
/// Bram Moolenaar --
[email protected] --
http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features --
http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute --
http://www.A-A-P.org ///
\\\ help me help AIDS victims --
http://ICCF-Holland.org ///
