|
 |
a2e699f |
To: vim-dev@vim.org
|
|
|
a2e699f |
Subject: Patch 7.1.225
|
|
|
a2e699f |
Fcc: outbox
|
|
|
a2e699f |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
a2e699f |
Mime-Version: 1.0
|
|
|
a2e699f |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
a2e699f |
Content-Transfer-Encoding: 8bit
|
|
|
a2e699f |
------------
|
|
|
a2e699f |
|
|
|
a2e699f |
Patch 7.1.225
|
|
|
a2e699f |
Problem: Using unitialized value when XGetWMNormalHints() fails.
|
|
|
a2e699f |
Solution: Check the return value. (Dominique Pelle)
|
|
|
a2e699f |
Files: src/os_unix.c
|
|
|
a2e699f |
|
|
|
a2e699f |
|
|
|
a2e699f |
*** ../vim-7.1.224/src/os_unix.c Sun Jan 13 13:53:30 2008
|
|
|
a2e699f |
--- src/os_unix.c Sun Jan 13 13:52:53 2008
|
|
|
a2e699f |
***************
|
|
|
a2e699f |
*** 6145,6153 ****
|
|
|
a2e699f |
if (xterm_trace == 1)
|
|
|
a2e699f |
{
|
|
|
a2e699f |
/* Get the hints just before tracking starts. The font size might
|
|
|
a2e699f |
! * have changed recently */
|
|
|
a2e699f |
! XGetWMNormalHints(xterm_dpy, x11_window, &xterm_hints, &got_hints);
|
|
|
a2e699f |
! if (!(got_hints & PResizeInc)
|
|
|
a2e699f |
|| xterm_hints.width_inc <= 1
|
|
|
a2e699f |
|| xterm_hints.height_inc <= 1)
|
|
|
a2e699f |
{
|
|
|
a2e699f |
--- 6145,6153 ----
|
|
|
a2e699f |
if (xterm_trace == 1)
|
|
|
a2e699f |
{
|
|
|
a2e699f |
/* Get the hints just before tracking starts. The font size might
|
|
|
a2e699f |
! * have changed recently. */
|
|
|
a2e699f |
! if (!XGetWMNormalHints(xterm_dpy, x11_window, &xterm_hints, &got_hints)
|
|
|
a2e699f |
! || !(got_hints & PResizeInc)
|
|
|
a2e699f |
|| xterm_hints.width_inc <= 1
|
|
|
a2e699f |
|| xterm_hints.height_inc <= 1)
|
|
|
a2e699f |
{
|
|
|
a2e699f |
*** ../vim-7.1.224/src/version.c Sun Jan 13 16:17:02 2008
|
|
|
a2e699f |
--- src/version.c Sun Jan 13 16:29:51 2008
|
|
|
a2e699f |
***************
|
|
|
a2e699f |
*** 668,669 ****
|
|
|
a2e699f |
--- 668,671 ----
|
|
|
a2e699f |
{ /* Add new patch number below this line */
|
|
|
a2e699f |
+ /**/
|
|
|
a2e699f |
+ 225,
|
|
|
a2e699f |
/**/
|
|
|
a2e699f |
|
|
|
a2e699f |
--
|
|
|
a2e699f |
"When I die, I want a tombstone that says "GAME OVER" - Ton Richters
|
|
|
a2e699f |
|
|
|
a2e699f |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
a2e699f |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
a2e699f |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
a2e699f |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|