]> git.ipfire.org Git - ipfire-3.x.git/blob - vim/patches/vim-7.3.097.patch0
Merge remote-tracking branch 'ms/openvswitch'
[ipfire-3.x.git] / vim / patches / vim-7.3.097.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.097
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.097
11 Problem: Using ":call" inside "if 0" does not see that a function returns a
12 Dict and gives error for "." as string concatenation.
13 Solution: Use eval0() to skip over the expression. (Yasuhiro Matsumoto)
14 Files: src/eval.c
15
16
17 *** ../vim-7.3.096/src/eval.c 2010-12-17 18:06:00.000000000 +0100
18 --- src/eval.c 2011-01-04 18:54:27.000000000 +0100
19 ***************
20 *** 3335,3340 ****
21 --- 3335,3349 ----
22 int failed = FALSE;
23 funcdict_T fudi;
24
25 + if (eap->skip)
26 + {
27 + /* trans_function_name() doesn't work well when skipping, use eval0()
28 + * instead to skip to any following command, e.g. for:
29 + * :if 0 | call dict.foo().bar() | endif */
30 + eval0(eap->arg, &rettv, &eap->nextcmd, FALSE);
31 + return;
32 + }
33 +
34 tofree = trans_function_name(&arg, eap->skip, TFN_INT, &fudi);
35 if (fudi.fd_newkey != NULL)
36 {
37 *** ../vim-7.3.096/src/version.c 2011-01-04 18:11:39.000000000 +0100
38 --- src/version.c 2011-01-04 19:00:21.000000000 +0100
39 ***************
40 *** 716,717 ****
41 --- 716,719 ----
42 { /* Add new patch number below this line */
43 + /**/
44 + 97,
45 /**/
46
47 --
48 hundred-and-one symptoms of being an internet addict:
49 86. E-mail Deficiency Depression (EDD) forces you to e-mail yourself.
50
51 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
52 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
53 \\\ an exciting new programming language -- http://www.Zimbu.org ///
54 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///