]>
Commit | Line | Data |
---|---|---|
d57b4abe ER |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.1.222 | |
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.222 (after 7.1.217) | |
11 | Problem: Wildcards in argument of ":helptags" are not expanded. (Marcel | |
12 | Svitalsky) | |
13 | Solution: Expand wildcards in the directory name. | |
14 | Files: src/ex_cmds.c | |
15 | ||
16 | ||
17 | *** ../vim-7.1.221/src/ex_cmds.c Fri Jan 11 21:00:49 2008 | |
18 | --- src/ex_cmds.c Sat Jan 12 21:40:51 2008 | |
19 | *************** | |
20 | *** 6106,6111 **** | |
21 | --- 6106,6113 ---- | |
22 | #ifdef FEAT_MULTI_LANG | |
23 | char_u lang[2]; | |
24 | #endif | |
25 | + expand_T xpc; | |
26 | + char_u *dirname; | |
27 | char_u ext[5]; | |
28 | char_u fname[8]; | |
29 | int filecount; | |
30 | *************** | |
31 | *** 6119,6125 **** | |
32 | eap->arg = skipwhite(eap->arg + 3); | |
33 | } | |
34 | ||
35 | ! if (!mch_isdir(eap->arg)) | |
36 | { | |
37 | EMSG2(_("E150: Not a directory: %s"), eap->arg); | |
38 | return; | |
39 | --- 6121,6131 ---- | |
40 | eap->arg = skipwhite(eap->arg + 3); | |
41 | } | |
42 | ||
43 | ! ExpandInit(&xpc); | |
44 | ! xpc.xp_context = EXPAND_DIRECTORIES; | |
45 | ! dirname = ExpandOne(&xpc, eap->arg, NULL, | |
46 | ! WILD_LIST_NOTFOUND|WILD_SILENT, WILD_EXPAND_FREE); | |
47 | ! if (dirname == NULL || !mch_isdir(dirname)) | |
48 | { | |
49 | EMSG2(_("E150: Not a directory: %s"), eap->arg); | |
50 | return; | |
51 | *************** | |
52 | *** 6127,6133 **** | |
53 | ||
54 | #ifdef FEAT_MULTI_LANG | |
55 | /* Get a list of all files in the directory. */ | |
56 | ! STRCPY(NameBuff, eap->arg); | |
57 | add_pathsep(NameBuff); | |
58 | STRCAT(NameBuff, "*"); | |
59 | if (gen_expand_wildcards(1, &NameBuff, &filecount, &files, | |
60 | --- 6133,6139 ---- | |
61 | ||
62 | #ifdef FEAT_MULTI_LANG | |
63 | /* Get a list of all files in the directory. */ | |
64 | ! STRCPY(NameBuff, dirname); | |
65 | add_pathsep(NameBuff); | |
66 | STRCAT(NameBuff, "*"); | |
67 | if (gen_expand_wildcards(1, &NameBuff, &filecount, &files, | |
68 | *************** | |
69 | *** 6135,6140 **** | |
70 | --- 6141,6147 ---- | |
71 | || filecount == 0) | |
72 | { | |
73 | EMSG2("E151: No match: %s", NameBuff); | |
74 | + vim_free(dirname); | |
75 | return; | |
76 | } | |
77 | ||
78 | *************** | |
79 | *** 6200,6206 **** | |
80 | ext[1] = fname[5]; | |
81 | ext[2] = fname[6]; | |
82 | } | |
83 | ! helptags_one(eap->arg, ext, fname, add_help_tags); | |
84 | } | |
85 | ||
86 | ga_clear(&ga); | |
87 | --- 6207,6213 ---- | |
88 | ext[1] = fname[5]; | |
89 | ext[2] = fname[6]; | |
90 | } | |
91 | ! helptags_one(dirname, ext, fname, add_help_tags); | |
92 | } | |
93 | ||
94 | ga_clear(&ga); | |
95 | *************** | |
96 | *** 6208,6215 **** | |
97 | ||
98 | #else | |
99 | /* No language support, just use "*.txt" and "tags". */ | |
100 | ! helptags_one(eap->arg, (char_u *)".txt", (char_u *)"tags", add_help_tags); | |
101 | #endif | |
102 | } | |
103 | ||
104 | static void | |
105 | --- 6215,6223 ---- | |
106 | ||
107 | #else | |
108 | /* No language support, just use "*.txt" and "tags". */ | |
109 | ! helptags_one(dirname, (char_u *)".txt", (char_u *)"tags", add_help_tags); | |
110 | #endif | |
111 | + vim_free(dirname); | |
112 | } | |
113 | ||
114 | static void | |
115 | *** ../vim-7.1.221/src/version.c Sat Jan 12 18:13:05 2008 | |
116 | --- src/version.c Sun Jan 13 13:27:04 2008 | |
117 | *************** | |
118 | *** 668,669 **** | |
119 | --- 668,671 ---- | |
120 | { /* Add new patch number below this line */ | |
121 | + /**/ | |
122 | + 222, | |
123 | /**/ | |
124 | ||
125 | -- | |
126 | Arthur pulls Pin out. The MONK blesses the grenade as ... | |
127 | ARTHUR: (quietly) One, two, five ... | |
128 | GALAHAD: Three, sir! | |
129 | ARTHUR: Three. | |
130 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
131 | ||
132 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
133 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
134 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
135 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |