]>
Commit | Line | Data |
---|---|---|
48112765 AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 6.2.370 | |
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 6.2.370 (extra, after 6.2.341) | |
11 | Problem: Win32: When the path to diff.exe contains a space and using the | |
12 | vimrc generated by the install program, diff mode may not work. | |
13 | (Alejandro Lopez-Valencia) | |
14 | Solution: Do not use double quotes for arguments that do not have a space. | |
15 | Files: src/dosinst.c | |
16 | ||
17 | ||
18 | *** ../vim-6.2.369/src/dosinst.c Thu Mar 11 20:46:51 2004 | |
19 | --- src/dosinst.c Tue Mar 16 12:59:30 2004 | |
20 | *************** | |
21 | *** 1177,1196 **** | |
22 | fprintf(fd, " let opt = ''\n"); | |
23 | fprintf(fd, " if &diffopt =~ 'icase' | let opt = opt . '-i ' | endif\n"); | |
24 | fprintf(fd, " if &diffopt =~ 'iwhite' | let opt = opt . '-b ' | endif\n"); | |
25 | ! fprintf(fd, " silent execute '!"); | |
26 | p = strchr(installdir, ' '); | |
27 | if (p != NULL) | |
28 | { | |
29 | ! /* The path has a space. Put a double quote just before the space | |
30 | ! * and at the end of the command. Putting quotes around the whole | |
31 | ! * thing doesn't work. */ | |
32 | *p = NUL; | |
33 | ! fprintf(fd, "%s\" %s\\diff\"", installdir, p + 1); | |
34 | *p = ' '; | |
35 | } | |
36 | else | |
37 | ! fprintf(fd, "%s\\diff", installdir); | |
38 | ! fprintf(fd, " -a ' . opt . '\"' . v:fname_in . '\" \"' . v:fname_new . '\" > \"' . v:fname_out . '\"'\n"); | |
39 | fprintf(fd, "endfunction\n"); | |
40 | fprintf(fd, "\n"); | |
41 | } | |
42 | --- 1177,1207 ---- | |
43 | fprintf(fd, " let opt = ''\n"); | |
44 | fprintf(fd, " if &diffopt =~ 'icase' | let opt = opt . '-i ' | endif\n"); | |
45 | fprintf(fd, " if &diffopt =~ 'iwhite' | let opt = opt . '-b ' | endif\n"); | |
46 | ! /* Use quotes only when needed, they may cause trouble. */ | |
47 | ! fprintf(fd, " let arg1 = v:fname_in\n"); | |
48 | ! fprintf(fd, " if arg1 =~ ' ' | let arg1 = '\"' . arg1 . '\"' | endif\n"); | |
49 | ! fprintf(fd, " let arg2 = v:fname_new\n"); | |
50 | ! fprintf(fd, " if arg2 =~ ' ' | let arg2 = '\"' . arg2 . '\"' | endif\n"); | |
51 | ! fprintf(fd, " let arg3 = v:fname_out\n"); | |
52 | ! fprintf(fd, " if arg3 =~ ' ' | let arg3 = '\"' . arg3 . '\"' | endif\n"); | |
53 | p = strchr(installdir, ' '); | |
54 | if (p != NULL) | |
55 | { | |
56 | ! /* The path has a space. When using cmd.exe (Win NT/2000/XP) put | |
57 | ! * quotes around the whole command and around the diff command. | |
58 | ! * Otherwise put a double quote just before the space and at the | |
59 | ! * end of the command. Putting quotes around the whole thing | |
60 | ! * doesn't work on Win 95/98/ME. This is mostly guessed! */ | |
61 | ! fprintf(fd, " if &sh =~ '\\<cmd'\n"); | |
62 | ! fprintf(fd, " silent execute '!\"\"%s\\diff\" -a ' . opt . arg1 . ' ' . arg2 . ' > ' . arg3 . '\"'\n", installdir); | |
63 | ! fprintf(fd, " else\n"); | |
64 | *p = NUL; | |
65 | ! fprintf(fd, " silent execute '!%s\" %s\\diff\" -a ' . opt . arg1 . ' ' . arg2 . ' > ' . arg3\n", installdir, p + 1); | |
66 | *p = ' '; | |
67 | + fprintf(fd, " endif\n"); | |
68 | } | |
69 | else | |
70 | ! fprintf(fd, " silent execute '!%s\\diff -a ' . opt . arg1 . ' ' . arg2 . ' > ' . arg3\n", installdir); | |
71 | fprintf(fd, "endfunction\n"); | |
72 | fprintf(fd, "\n"); | |
73 | } | |
74 | *** ../vim-6.2.369/src/version.c Wed Mar 17 14:08:56 2004 | |
75 | --- src/version.c Wed Mar 17 15:16:56 2004 | |
76 | *************** | |
77 | *** 639,640 **** | |
78 | --- 639,642 ---- | |
79 | { /* Add new patch number below this line */ | |
80 | + /**/ | |
81 | + 370, | |
82 | /**/ | |
83 | ||
84 | -- | |
85 | Light travels faster than sound. This is why some people | |
86 | appear bright until you hear them speak | |
87 | ||
88 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
89 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
90 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
91 | \\\ Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html /// |