]> git.ipfire.org Git - ipfire-3.x.git/blob - vim/patches/vim-7.3.481.patch0
Merge remote-tracking branch 'stevee/dracut'
[ipfire-3.x.git] / vim / patches / vim-7.3.481.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.481
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.3.481
11 Problem: Changing 'virtualedit' in an operator function to "all" does not
12 have the desired effect. (Aaron Bohannon)
13 Solution: Save, reset and restore virtual_op when executing an operator
14 function.
15 Files: src/normal.c
16
17
18 *** ../vim-7.3.480/src/normal.c 2012-02-05 01:18:41.000000000 +0100
19 --- src/normal.c 2012-03-28 12:59:46.000000000 +0200
20 ***************
21 *** 2279,2284 ****
22 --- 2279,2285 ----
23 {
24 #ifdef FEAT_EVAL
25 char_u *(argv[1]);
26 + int save_virtual_op = virtual_op;
27
28 if (*p_opfunc == NUL)
29 EMSG(_("E774: 'operatorfunc' is empty"));
30 ***************
31 *** 2297,2303 ****
32 --- 2298,2311 ----
33 argv[0] = (char_u *)"line";
34 else
35 argv[0] = (char_u *)"char";
36 +
37 + /* Reset virtual_op so that 'virtualedit' can be changed in the
38 + * function. */
39 + virtual_op = MAYBE;
40 +
41 (void)call_func_retnr(p_opfunc, 1, argv, FALSE);
42 +
43 + virtual_op = save_virtual_op;
44 }
45 #else
46 EMSG(_("E775: Eval feature not available"));
47 *** ../vim-7.3.480/src/version.c 2012-03-23 18:39:10.000000000 +0100
48 --- src/version.c 2012-03-28 12:50:20.000000000 +0200
49 ***************
50 *** 716,717 ****
51 --- 716,719 ----
52 { /* Add new patch number below this line */
53 + /**/
54 + 481,
55 /**/
56
57 --
58 hundred-and-one symptoms of being an internet addict:
59 269. You wonder how you can make your dustbin produce Sesame Street's
60 Oscar's the Garbage Monster song when you empty it.
61
62 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
63 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
64 \\\ an exciting new programming language -- http://www.Zimbu.org ///
65 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///