diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-01-13 15:31:00 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-01-13 15:31:00 +0000 |
| commit | a6c2c91d3283009f79ccfe8625131b36c472dec5 (patch) | |
| tree | db75b123e9c87962f8f67dccfda68c3497b6abcb | |
| parent | c4cd38f369d7ca3e60a1acc10461ee03346cceff (diff) | |
| download | vim-git-a6c2c91d3283009f79ccfe8625131b36c472dec5.tar.gz | |
updated for version 7.1-225v7.1.225
| -rw-r--r-- | src/os_unix.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 9f13a0f74..2dbf5a5fd 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -6145,9 +6145,9 @@ do_xterm_trace() if (xterm_trace == 1) { /* Get the hints just before tracking starts. The font size might - * have changed recently */ - XGetWMNormalHints(xterm_dpy, x11_window, &xterm_hints, &got_hints); - if (!(got_hints & PResizeInc) + * have changed recently. */ + if (!XGetWMNormalHints(xterm_dpy, x11_window, &xterm_hints, &got_hints) + || !(got_hints & PResizeInc) || xterm_hints.width_inc <= 1 || xterm_hints.height_inc <= 1) { diff --git a/src/version.c b/src/version.c index e80dbdea5..34003b966 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 225, +/**/ 224, /**/ 223, |