|
 |
073263 |
To: vim_dev@googlegroups.com
|
|
|
073263 |
Subject: Patch 7.4.342
|
|
|
073263 |
Fcc: outbox
|
|
|
073263 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
073263 |
Mime-Version: 1.0
|
|
|
073263 |
Content-Type: text/plain; charset=UTF-8
|
|
|
073263 |
Content-Transfer-Encoding: 8bit
|
|
|
073263 |
------------
|
|
|
073263 |
|
|
|
073263 |
Patch 7.4.342
|
|
|
073263 |
Problem: Clang gives warnings.
|
|
|
073263 |
Solution: Add an else block. (Dominique Pelle)
|
|
|
073263 |
Files: src/gui_beval.c
|
|
|
073263 |
|
|
|
073263 |
|
|
|
073263 |
*** ../vim-7.4.341/src/gui_beval.c 2013-05-06 04:06:04.000000000 +0200
|
|
|
073263 |
--- src/gui_beval.c 2014-06-25 17:40:40.818759649 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 1193,1203 ****
|
|
|
073263 |
XmFontList fl;
|
|
|
073263 |
|
|
|
073263 |
fl = gui_motif_fontset2fontlist(&gui.tooltip_fontset);
|
|
|
073263 |
! if (fl != NULL)
|
|
|
073263 |
{
|
|
|
073263 |
! XmStringExtent(fl, s, &w, &h);
|
|
|
073263 |
! XmFontListFree(fl);
|
|
|
073263 |
}
|
|
|
073263 |
}
|
|
|
073263 |
w += gui.border_offset << 1;
|
|
|
073263 |
h += gui.border_offset << 1;
|
|
|
073263 |
--- 1193,1205 ----
|
|
|
073263 |
XmFontList fl;
|
|
|
073263 |
|
|
|
073263 |
fl = gui_motif_fontset2fontlist(&gui.tooltip_fontset);
|
|
|
073263 |
! if (fl == NULL)
|
|
|
073263 |
{
|
|
|
073263 |
! XmStringFree(s);
|
|
|
073263 |
! return;
|
|
|
073263 |
}
|
|
|
073263 |
+ XmStringExtent(fl, s, &w, &h);
|
|
|
073263 |
+ XmFontListFree(fl);
|
|
|
073263 |
}
|
|
|
073263 |
w += gui.border_offset << 1;
|
|
|
073263 |
h += gui.border_offset << 1;
|
|
|
073263 |
*** ../vim-7.4.341/src/version.c 2014-06-25 17:31:04.942737863 +0200
|
|
|
073263 |
--- src/version.c 2014-06-25 17:40:56.902760258 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 736,737 ****
|
|
|
073263 |
--- 736,739 ----
|
|
|
073263 |
{ /* Add new patch number below this line */
|
|
|
073263 |
+ /**/
|
|
|
073263 |
+ 342,
|
|
|
073263 |
/**/
|
|
|
073263 |
|
|
|
073263 |
--
|
|
|
073263 |
CUSTOMER: Well, can you hang around a couple of minutes? He won't be
|
|
|
073263 |
long.
|
|
|
073263 |
MORTICIAN: Naaah, I got to go on to Robinson's -- they've lost nine today.
|
|
|
073263 |
CUSTOMER: Well, when is your next round?
|
|
|
073263 |
MORTICIAN: Thursday.
|
|
|
073263 |
DEAD PERSON: I think I'll go for a walk.
|
|
|
073263 |
The Quest for the Holy Grail (Monty Python)
|
|
|
073263 |
|
|
|
073263 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
073263 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
073263 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
073263 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|