]>
Commit | Line | Data |
---|---|---|
e4816a84 ER |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.2.242 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.2.242 | |
11 | Problem: Setting 'lazyredraw' causes the cursor column to be recomputed. | |
12 | (Tom Link) | |
13 | Solution: Only recompute the cursor column for a boolean option if changes | |
14 | the cursor position. | |
15 | Files: src/option.c | |
16 | ||
17 | ||
18 | *** ../vim-7.2.241/src/option.c 2009-07-22 14:27:33.000000000 +0200 | |
19 | --- src/option.c 2009-07-29 10:03:39.000000000 +0200 | |
20 | *************** | |
21 | *** 7194,7199 **** | |
22 | --- 7194,7207 ---- | |
23 | compatible_set(); | |
24 | } | |
25 | ||
26 | + /* 'list', 'number' */ | |
27 | + else if ((int *)varp == &curwin->w_p_list | |
28 | + || (int *)varp == &curwin->w_p_nu) | |
29 | + { | |
30 | + if (curwin->w_curswant != MAXCOL) | |
31 | + curwin->w_set_curswant = TRUE; | |
32 | + } | |
33 | + | |
34 | else if ((int *)varp == &curbuf->b_p_ro) | |
35 | { | |
36 | /* when 'readonly' is reset globally, also reset readonlymode */ | |
37 | *************** | |
38 | *** 7645,7650 **** | |
39 | --- 7653,7666 ---- | |
40 | curbuf->b_p_imsearch = B_IMODE_USE_INSERT; | |
41 | # endif | |
42 | } | |
43 | + if (curwin->w_curswant != MAXCOL) | |
44 | + curwin->w_set_curswant = TRUE; | |
45 | + } | |
46 | + | |
47 | + else if ((int *)varp == &p_arshape) | |
48 | + { | |
49 | + if (curwin->w_curswant != MAXCOL) | |
50 | + curwin->w_set_curswant = TRUE; | |
51 | } | |
52 | #endif | |
53 | ||
54 | *************** | |
55 | *** 7655,7662 **** | |
56 | options[opt_idx].flags |= P_WAS_SET; | |
57 | ||
58 | comp_col(); /* in case 'ruler' or 'showcmd' changed */ | |
59 | ! if (curwin->w_curswant != MAXCOL) | |
60 | ! curwin->w_set_curswant = TRUE; /* in case 'list' changed */ | |
61 | check_redraw(options[opt_idx].flags); | |
62 | ||
63 | return NULL; | |
64 | --- 7671,7677 ---- | |
65 | options[opt_idx].flags |= P_WAS_SET; | |
66 | ||
67 | comp_col(); /* in case 'ruler' or 'showcmd' changed */ | |
68 | ! | |
69 | check_redraw(options[opt_idx].flags); | |
70 | ||
71 | return NULL; | |
72 | *** ../vim-7.2.241/src/version.c 2009-07-29 12:09:49.000000000 +0200 | |
73 | --- src/version.c 2009-07-29 15:40:43.000000000 +0200 | |
74 | *************** | |
75 | *** 678,679 **** | |
76 | --- 678,681 ---- | |
77 | { /* Add new patch number below this line */ | |
78 | + /**/ | |
79 | + 242, | |
80 | /**/ | |
81 | ||
82 | -- | |
83 | hundred-and-one symptoms of being an internet addict: | |
84 | 117. You are more comfortable typing in html. | |
85 | ||
86 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
87 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
88 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
89 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |