]>
Commit | Line | Data |
---|---|---|
d57b4abe ER |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.1.226 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.1.226 | |
11 | Problem: Command line completion doesn't work when a file name contains a | |
12 | '&' character. | |
13 | Solution: Accept all characters in a file name, except ones that end a | |
14 | command or white space. | |
15 | Files: src/ex_docmd.c | |
16 | ||
17 | ||
18 | *** ../vim-7.1.225/src/ex_docmd.c Wed Jan 9 20:29:51 2008 | |
19 | --- src/ex_docmd.c Wed Jan 9 20:11:13 2008 | |
20 | *************** | |
21 | *** 3338,3349 **** | |
22 | } | |
23 | in_quote = !in_quote; | |
24 | } | |
25 | #ifdef SPACE_IN_FILENAME | |
26 | ! else if (!vim_isfilec_or_wc(c) | |
27 | ! && (!(ea.argt & NOSPC) || usefilter)) | |
28 | ! #else | |
29 | ! else if (!vim_isfilec_or_wc(c)) | |
30 | #endif | |
31 | { | |
32 | while (*p != NUL) | |
33 | { | |
34 | --- 3338,3350 ---- | |
35 | } | |
36 | in_quote = !in_quote; | |
37 | } | |
38 | + /* An argument can contain just about everything, except | |
39 | + * characters that end the command and white space. */ | |
40 | + else if (c == '|' || c == '\n' || c == '"' || (vim_iswhite(c) | |
41 | #ifdef SPACE_IN_FILENAME | |
42 | ! && (!(ea.argt & NOSPC) || usefilter) | |
43 | #endif | |
44 | + )) | |
45 | { | |
46 | while (*p != NUL) | |
47 | { | |
48 | *** ../vim-7.1.225/src/version.c Sun Jan 13 16:30:23 2008 | |
49 | --- src/version.c Sun Jan 13 17:10:15 2008 | |
50 | *************** | |
51 | *** 668,669 **** | |
52 | --- 668,671 ---- | |
53 | { /* Add new patch number below this line */ | |
54 | + /**/ | |
55 | + 226, | |
56 | /**/ | |
57 | ||
58 | -- | |
59 | [Another hideous roar.] | |
60 | BEDEVERE: That's it! | |
61 | ARTHUR: What? | |
62 | BEDEVERE: It's The Legendary Black Beast of Aaaaarrrrrrggghhh! | |
63 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
64 | ||
65 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
66 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
67 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
68 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |