blob: c2f700c5847c8d5239e41d201a89d9781315c046 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
To: vim_dev@googlegroups.com
Subject: Patch 7.3.643
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.643 (after 7.3.635)
Problem: MS-Windows: When starting gvim maximized 'lines' and 'columns' are
wrong. (Christian Robinson)
Solution: Move the check for gui.starting from ui_get_shellsize() to
check_shellsize().
Files: src/ui.c, src/term.c
*** ../vim-7.3.642/src/ui.c 2012-08-23 13:28:50.000000000 +0200
--- src/ui.c 2012-08-29 16:20:04.000000000 +0200
***************
*** 298,306 ****
int retval;
#ifdef FEAT_GUI
- if (gui.starting)
- /* possibly a system call during startup, check later */
- return OK;
if (gui.in_use)
retval = gui_get_shellsize();
else
--- 298,303 ----
*** ../vim-7.3.642/src/term.c 2012-08-15 16:20:59.000000000 +0200
--- src/term.c 2012-08-29 16:22:25.000000000 +0200
***************
*** 3006,3012 ****
int old_Rows = Rows;
int old_Columns = Columns;
! if (!exiting)
{
(void)ui_get_shellsize();
check_shellsize();
--- 3006,3018 ----
int old_Rows = Rows;
int old_Columns = Columns;
! if (!exiting
! #ifdef FEAT_GUI
! /* Do not get the size when executing a shell command during
! * startup. */
! && !gui.starting
! #endif
! )
{
(void)ui_get_shellsize();
check_shellsize();
*** ../vim-7.3.642/src/version.c 2012-08-29 15:50:22.000000000 +0200
--- src/version.c 2012-08-29 16:25:42.000000000 +0200
***************
*** 721,722 ****
--- 721,724 ----
{ /* Add new patch number below this line */
+ /**/
+ 643,
/**/
--
Eight Megabytes And Continually Swapping.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
