]> git.pld-linux.org Git - packages/vim.git/blame - 6.2.245
- removed conflict with 6.2.259
[packages/vim.git] / 6.2.245
CommitLineData
05649561
AG
1To: vim-dev@vim.org
2Subject: Patch 6.2.245
3Fcc: outbox
4From: Bram Moolenaar <Bram@moolenaar.net>
5Mime-Version: 1.0
6Content-Type: text/plain; charset=ISO-8859-1
7Content-Transfer-Encoding: 8bit
8------------
9
10Patch 6.2.245
11Problem: Completion doesn't work for ":keepmarks" and ":lockmarks".
12Solution: Add the command modifiers to the table of commands. (Madoka
13 Machitani)
14Files: src/ex_cmds.h, src/ex_docmd.c
15
16
17*** ../vim-6.2.244/src/ex_cmds.h Sun Feb 1 20:08:40 2004
18--- src/ex_cmds.h Sat Feb 7 18:10:50 2004
19***************
20*** 440,445 ****
21--- 440,447 ----
22 TRLBAR|CMDWIN),
23 EX(CMD_k, "k", ex_mark,
24 RANGE|WORD1|TRLBAR|SBOXOK|CMDWIN),
25+ EX(CMD_keepmarks, "keepmarks", ex_wrongmodifier,
26+ NEEDARG|EXTRA|NOTRLCOM),
27 EX(CMD_list, "list", ex_print,
28 RANGE|WHOLEFOLD|COUNT|TRLBAR|CMDWIN),
29 EX(CMD_last, "last", ex_last,
30***************
31*** 466,471 ****
32--- 468,475 ----
33 FILE1|TRLBAR),
34 EX(CMD_loadkeymap, "loadkeymap", ex_loadkeymap,
35 CMDWIN),
36+ EX(CMD_lockmarks, "lockmarks", ex_wrongmodifier,
37+ NEEDARG|EXTRA|NOTRLCOM),
38 EX(CMD_lunmap, "lunmap", ex_unmap,
39 EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
40 EX(CMD_ls, "ls", buflist_list,
41*** ../vim-6.2.244/src/ex_docmd.c Thu Feb 5 16:04:26 2004
42--- src/ex_docmd.c Sat Feb 7 18:22:26 2004
43***************
44*** 2351,2358 ****
45--- 2351,2360 ----
46 case CMD_ilist:
47 case CMD_isearch:
48 case CMD_isplit:
49+ case CMD_keepmarks:
50 case CMD_leftabove:
51 case CMD_let:
52+ case CMD_lockmarks:
53 case CMD_match:
54 case CMD_psearch:
55 case CMD_return:
56***************
57*** 2844,2853 ****
58 /*
59 * Isolate the command and search for it in the command table.
60 * Exceptions:
61! * - the 'k' command can directly be followed by any character.
62 * - the 's' command can be followed directly by 'c', 'g', 'i', 'I' or 'r'
63 */
64! if (*cmd == 'k')
65 {
66 cmdidx = CMD_k;
67 p = cmd + 1;
68--- 2846,2856 ----
69 /*
70 * Isolate the command and search for it in the command table.
71 * Exceptions:
72! * - the 'k' command can directly be followed by any character, but
73! * do accept "keepmarks".
74 * - the 's' command can be followed directly by 'c', 'g', 'i', 'I' or 'r'
75 */
76! if (*cmd == 'k' && cmd[1] != 'e')
77 {
78 cmdidx = CMD_k;
79 p = cmd + 1;
80***************
81*** 3184,3190 ****
82--- 3187,3195 ----
83 case CMD_folddoclosed:
84 case CMD_folddoopen:
85 case CMD_hide:
86+ case CMD_keepmarks:
87 case CMD_leftabove:
88+ case CMD_lockmarks:
89 case CMD_rightbelow:
90 case CMD_silent:
91 case CMD_topleft:
92*** ../vim-6.2.244/src/version.c Sun Feb 8 15:13:33 2004
93--- src/version.c Sun Feb 8 17:06:12 2004
94***************
95*** 639,640 ****
96--- 639,642 ----
97 { /* Add new patch number below this line */
98+ /**/
99+ 245,
100 /**/
101
102--
103hundred-and-one symptoms of being an internet addict:
10485. Choice between paying Compuserve bill and paying for kids education
105 is a no brainer -- although a bit painful for your kids.
106
107 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
108/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
109\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
110 \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///
This page took 0.05131 seconds and 4 git commands to generate.