1 To: [email protected] |
|
2 Subject: Patch 7.2.410 |
|
3 Fcc: outbox |
|
4 From: Bram Moolenaar <[email protected]> |
|
5 Mime-Version: 1.0 |
|
6 Content-Type: text/plain; charset=UTF-8 |
|
7 Content-Transfer-Encoding: 8bit |
|
8 ------------ |
|
9 |
|
10 Patch 7.2.410 |
|
11 Problem: Highlighting directories for completion doesn't work properly. |
|
12 Solution: Don't halve backslashes when not needed, expaned "~/". |
|
13 (Dominique Pelle) |
|
14 Files: src/ex_getln.c |
|
15 |
|
16 |
|
17 *** ../vim-7.2.409/src/ex_getln.c 2010-03-17 19:13:19.000000000 +0100 |
|
18 --- src/ex_getln.c 2010-03-23 18:00:56.000000000 +0100 |
|
19 *************** |
|
20 *** 3948,3959 **** |
|
21 || xp->xp_context == EXPAND_SHELLCMD |
|
22 || xp->xp_context == EXPAND_BUFFERS) |
|
23 { |
|
24 - char_u *halved_slash; |
|
25 - |
|
26 /* highlight directories */ |
|
27 ! halved_slash = backslash_halve_save(files_found[k]); |
|
28 ! j = mch_isdir(halved_slash); |
|
29 ! vim_free(halved_slash); |
|
30 if (showtail) |
|
31 p = L_SHOWFILE(k); |
|
32 else |
|
33 --- 3948,3973 ---- |
|
34 || xp->xp_context == EXPAND_SHELLCMD |
|
35 || xp->xp_context == EXPAND_BUFFERS) |
|
36 { |
|
37 /* highlight directories */ |
|
38 ! if (xp->xp_numfiles != -1) |
|
39 ! { |
|
40 ! char_u *halved_slash; |
|
41 ! char_u *exp_path; |
|
42 ! |
|
43 ! /* Expansion was done before and special characters |
|
44 ! * were escaped, need to halve backslashes. Also |
|
45 ! * $HOME has been replaced with ~/. */ |
|
46 ! exp_path = expand_env_save_opt(files_found[k], TRUE); |
|
47 ! halved_slash = backslash_halve_save( |
|
48 ! exp_path != NULL ? exp_path : files_found[k]); |
|
49 ! j = mch_isdir(halved_slash != NULL ? halved_slash |
|
50 ! : files_found[k]); |
|
51 ! vim_free(exp_path); |
|
52 ! vim_free(halved_slash); |
|
53 ! } |
|
54 ! else |
|
55 ! /* Expansion was done here, file names are literal. */ |
|
56 ! j = mch_isdir(files_found[k]); |
|
57 if (showtail) |
|
58 p = L_SHOWFILE(k); |
|
59 else |
|
60 *** ../vim-7.2.409/src/version.c 2010-03-23 17:49:19.000000000 +0100 |
|
61 --- src/version.c 2010-03-23 18:04:25.000000000 +0100 |
|
62 *************** |
|
63 *** 683,684 **** |
|
64 --- 683,686 ---- |
|
65 { /* Add new patch number below this line */ |
|
66 + /**/ |
|
67 + 410, |
|
68 /**/ |
|
69 |
|
70 -- |
|
71 BRIDGEKEEPER: What is your favorite colour? |
|
72 GAWAIN: Blue ... No yelloooooww! |
|
73 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD |
|
74 |
|
75 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
76 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
77 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
78 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
|