|
 |
70cbd75 |
To: vim-dev@vim.org
|
|
|
70cbd75 |
Subject: Patch 7.2.358
|
|
|
70cbd75 |
Fcc: outbox
|
|
|
70cbd75 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
70cbd75 |
Mime-Version: 1.0
|
|
|
70cbd75 |
Content-Type: text/plain; charset=UTF-8
|
|
|
70cbd75 |
Content-Transfer-Encoding: 8bit
|
|
|
70cbd75 |
------------
|
|
|
70cbd75 |
|
|
|
70cbd75 |
Patch 7.2.358
|
|
|
70cbd75 |
Problem: Compiler warnings on VMS. (Zoltan Arpadffy)
|
|
|
70cbd75 |
Solution: Pass array itself instead its address. Return a value.
|
|
|
70cbd75 |
Files: src/gui_gtk_x11.c, src/os_unix.c
|
|
|
70cbd75 |
|
|
|
70cbd75 |
|
|
|
70cbd75 |
*** ../vim-7.2.357/src/gui_gtk_x11.c 2009-11-03 18:13:36.000000000 +0100
|
|
|
70cbd75 |
--- src/gui_gtk_x11.c 2010-02-11 18:00:28.000000000 +0100
|
|
|
70cbd75 |
***************
|
|
|
70cbd75 |
*** 6190,6196 ****
|
|
|
70cbd75 |
int pcc[MAX_MCO];
|
|
|
70cbd75 |
|
|
|
70cbd75 |
/* TODO: use the composing characters */
|
|
|
70cbd75 |
! c = utfc_ptr2char_len(p, &pcc, len - (p - s));
|
|
|
70cbd75 |
if (c >= 0x10000) /* show chars > 0xffff as ? */
|
|
|
70cbd75 |
c = 0xbf;
|
|
|
70cbd75 |
buf[textlen].byte1 = c >> 8;
|
|
|
70cbd75 |
--- 6190,6196 ----
|
|
|
70cbd75 |
int pcc[MAX_MCO];
|
|
|
70cbd75 |
|
|
|
70cbd75 |
/* TODO: use the composing characters */
|
|
|
70cbd75 |
! c = utfc_ptr2char_len(p, pcc, len - (p - s));
|
|
|
70cbd75 |
if (c >= 0x10000) /* show chars > 0xffff as ? */
|
|
|
70cbd75 |
c = 0xbf;
|
|
|
70cbd75 |
buf[textlen].byte1 = c >> 8;
|
|
|
70cbd75 |
*** ../vim-7.2.357/src/os_unix.c 2009-07-22 13:27:50.000000000 +0200
|
|
|
70cbd75 |
--- src/os_unix.c 2010-02-11 18:10:20.000000000 +0100
|
|
|
70cbd75 |
***************
|
|
|
70cbd75 |
*** 1471,1476 ****
|
|
|
70cbd75 |
--- 1471,1479 ----
|
|
|
70cbd75 |
{
|
|
|
70cbd75 |
/* This function should not return, it causes exit(). Longjump instead. */
|
|
|
70cbd75 |
LONGJMP(lc_jump_env, 1);
|
|
|
70cbd75 |
+ # ifdef VMS
|
|
|
70cbd75 |
+ return 0; /* avoid the compiler complains about missing return value */
|
|
|
70cbd75 |
+ # endif
|
|
|
70cbd75 |
}
|
|
|
70cbd75 |
# endif
|
|
|
70cbd75 |
|
|
|
70cbd75 |
***************
|
|
|
70cbd75 |
*** 1490,1495 ****
|
|
|
70cbd75 |
--- 1493,1501 ----
|
|
|
70cbd75 |
|
|
|
70cbd75 |
/* This function should not return, it causes exit(). Longjump instead. */
|
|
|
70cbd75 |
LONGJMP(x_jump_env, 1);
|
|
|
70cbd75 |
+ # ifdef VMS
|
|
|
70cbd75 |
+ return 0; /* avoid the compiler complains about missing return value */
|
|
|
70cbd75 |
+ # endif
|
|
|
70cbd75 |
}
|
|
|
70cbd75 |
#endif
|
|
|
70cbd75 |
|
|
|
70cbd75 |
*** ../vim-7.2.357/src/version.c 2010-02-11 17:02:04.000000000 +0100
|
|
|
70cbd75 |
--- src/version.c 2010-02-11 18:10:45.000000000 +0100
|
|
|
70cbd75 |
***************
|
|
|
70cbd75 |
*** 683,684 ****
|
|
|
70cbd75 |
--- 683,686 ----
|
|
|
70cbd75 |
{ /* Add new patch number below this line */
|
|
|
70cbd75 |
+ /**/
|
|
|
70cbd75 |
+ 358,
|
|
|
70cbd75 |
/**/
|
|
|
70cbd75 |
|
|
|
70cbd75 |
--
|
|
|
70cbd75 |
hundred-and-one symptoms of being an internet addict:
|
|
|
70cbd75 |
221. Your wife melts your keyboard in the oven.
|
|
|
70cbd75 |
|
|
|
70cbd75 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
70cbd75 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
70cbd75 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
70cbd75 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|