]> git.ipfire.org Git - ipfire-3.x.git/blob - vim/patches/vim-7.3.504.patch0
Merge remote-tracking branch 'stevee/dracut'
[ipfire-3.x.git] / vim / patches / vim-7.3.504.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.504
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.504
11 Problem: Commands in help files are not highlighted.
12 Solution: Allow for commands in backticks. Adjust CTRL-] to remove the
13 backticks.
14 Files: src/ex_cmds.c
15
16
17 *** ../vim-7.3.503/src/ex_cmds.c 2012-04-05 16:04:58.000000000 +0200
18 --- src/ex_cmds.c 2012-04-25 12:51:41.000000000 +0200
19 ***************
20 *** 3421,3427 ****
21 * and re-attach to buffer, perhaps.
22 */
23 if (curwin->w_s == &(curwin->w_buffer->b_s))
24 ! curwin->w_s = &(buf->b_s);
25 #endif
26 curwin->w_buffer = buf;
27 curbuf = buf;
28 --- 3421,3427 ----
29 * and re-attach to buffer, perhaps.
30 */
31 if (curwin->w_s == &(curwin->w_buffer->b_s))
32 ! curwin->w_s = &(buf->b_s);
33 #endif
34 curwin->w_buffer = buf;
35 curbuf = buf;
36 ***************
37 *** 5965,5970 ****
38 --- 5965,5993 ----
39 break;
40 }
41 *d = NUL;
42 +
43 + if (*IObuff == '`')
44 + {
45 + if (d > IObuff + 2 && d[-1] == '`')
46 + {
47 + /* remove the backticks from `command` */
48 + mch_memmove(IObuff, IObuff + 1, STRLEN(IObuff));
49 + d[-2] = NUL;
50 + }
51 + else if (d > IObuff + 3 && d[-2] == '`' && d[-1] == ',')
52 + {
53 + /* remove the backticks and comma from `command`, */
54 + mch_memmove(IObuff, IObuff + 1, STRLEN(IObuff));
55 + d[-3] = NUL;
56 + }
57 + else if (d > IObuff + 4 && d[-3] == '`'
58 + && d[-2] == '\\' && d[-1] == '.')
59 + {
60 + /* remove the backticks and dot from `command`\. */
61 + mch_memmove(IObuff, IObuff + 1, STRLEN(IObuff));
62 + d[-4] = NUL;
63 + }
64 + }
65 }
66 }
67
68 *** ../vim-7.3.503/src/version.c 2012-04-25 12:28:05.000000000 +0200
69 --- src/version.c 2012-04-25 12:46:43.000000000 +0200
70 ***************
71 *** 716,717 ****
72 --- 716,719 ----
73 { /* Add new patch number below this line */
74 + /**/
75 + 504,
76 /**/
77
78 --
79 TIM: That is not an ordinary rabbit ... 'tis the most foul cruel and
80 bad-tempered thing you ever set eyes on.
81 ROBIN: You tit. I soiled my armour I was so scared!
82 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
83
84 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
85 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
86 \\\ an exciting new programming language -- http://www.Zimbu.org ///
87 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///