]>
Commit | Line | Data |
---|---|---|
d57b4abe ER |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.1.225 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.1.225 | |
11 | Problem: Using unitialized value when XGetWMNormalHints() fails. | |
12 | Solution: Check the return value. (Dominique Pelle) | |
13 | Files: src/os_unix.c | |
14 | ||
15 | ||
16 | *** ../vim-7.1.224/src/os_unix.c Sun Jan 13 13:53:30 2008 | |
17 | --- src/os_unix.c Sun Jan 13 13:52:53 2008 | |
18 | *************** | |
19 | *** 6145,6153 **** | |
20 | if (xterm_trace == 1) | |
21 | { | |
22 | /* Get the hints just before tracking starts. The font size might | |
23 | ! * have changed recently */ | |
24 | ! XGetWMNormalHints(xterm_dpy, x11_window, &xterm_hints, &got_hints); | |
25 | ! if (!(got_hints & PResizeInc) | |
26 | || xterm_hints.width_inc <= 1 | |
27 | || xterm_hints.height_inc <= 1) | |
28 | { | |
29 | --- 6145,6153 ---- | |
30 | if (xterm_trace == 1) | |
31 | { | |
32 | /* Get the hints just before tracking starts. The font size might | |
33 | ! * have changed recently. */ | |
34 | ! if (!XGetWMNormalHints(xterm_dpy, x11_window, &xterm_hints, &got_hints) | |
35 | ! || !(got_hints & PResizeInc) | |
36 | || xterm_hints.width_inc <= 1 | |
37 | || xterm_hints.height_inc <= 1) | |
38 | { | |
39 | *** ../vim-7.1.224/src/version.c Sun Jan 13 16:17:02 2008 | |
40 | --- src/version.c Sun Jan 13 16:29:51 2008 | |
41 | *************** | |
42 | *** 668,669 **** | |
43 | --- 668,671 ---- | |
44 | { /* Add new patch number below this line */ | |
45 | + /**/ | |
46 | + 225, | |
47 | /**/ | |
48 | ||
49 | -- | |
50 | "When I die, I want a tombstone that says "GAME OVER" - Ton Richters | |
51 | ||
52 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
53 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
54 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
55 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |