]>
Commit | Line | Data |
---|---|---|
eafbe892 AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.2.290 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.2.290 | |
11 | Problem: Not freeing memory from ":lmap", ":xmap" and ":menutranslate". | |
12 | Solution: Free the memory when exiting. (Dominique Pelle) | |
13 | Files: src/misc2.c | |
14 | ||
15 | ||
16 | *** ../vim-7.2.289/src/misc2.c 2009-11-03 16:44:04.000000000 +0100 | |
17 | --- src/misc2.c 2009-11-11 16:49:13.000000000 +0100 | |
18 | *************** | |
19 | *** 1005,1013 **** | |
20 | --- 1005,1018 ---- | |
21 | # ifdef FEAT_MENU | |
22 | /* Clear menus. */ | |
23 | do_cmdline_cmd((char_u *)"aunmenu *"); | |
24 | + # ifdef FEAT_MULTI_LANG | |
25 | + do_cmdline_cmd((char_u *)"menutranslate clear"); | |
26 | + # endif | |
27 | # endif | |
28 | ||
29 | /* Clear mappings, abbreviations, breakpoints. */ | |
30 | + do_cmdline_cmd((char_u *)"lmapclear"); | |
31 | + do_cmdline_cmd((char_u *)"xmapclear"); | |
32 | do_cmdline_cmd((char_u *)"mapclear"); | |
33 | do_cmdline_cmd((char_u *)"mapclear!"); | |
34 | do_cmdline_cmd((char_u *)"abclear"); | |
35 | *************** | |
36 | *** 1282,1288 **** | |
37 | ||
38 | /* | |
39 | * Escape "string" for use as a shell argument with system(). | |
40 | ! * This uses single quotes, except when we know we need to use double qoutes | |
41 | * (MS-DOS and MS-Windows without 'shellslash' set). | |
42 | * Escape a newline, depending on the 'shell' option. | |
43 | * When "do_special" is TRUE also replace "!", "%", "#" and things starting | |
44 | --- 1287,1293 ---- | |
45 | ||
46 | /* | |
47 | * Escape "string" for use as a shell argument with system(). | |
48 | ! * This uses single quotes, except when we know we need to use double quotes | |
49 | * (MS-DOS and MS-Windows without 'shellslash' set). | |
50 | * Escape a newline, depending on the 'shell' option. | |
51 | * When "do_special" is TRUE also replace "!", "%", "#" and things starting | |
52 | *************** | |
53 | *** 1537,1543 **** | |
54 | #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
55 | /* | |
56 | * Copy a character a number of times. | |
57 | ! * Does not work for multi-byte charactes! | |
58 | */ | |
59 | void | |
60 | copy_chars(ptr, count, c) | |
61 | --- 1542,1548 ---- | |
62 | #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
63 | /* | |
64 | * Copy a character a number of times. | |
65 | ! * Does not work for multi-byte characters! | |
66 | */ | |
67 | void | |
68 | copy_chars(ptr, count, c) | |
69 | *************** | |
70 | *** 4260,4266 **** | |
71 | * or '**76' is transposed to '**N'( 'N' is ASCII value 76). | |
72 | * For EBCDIC you get different character values. | |
73 | * If no restrict is given after '**' the default is used. | |
74 | ! * Due to this technic the path looks awful if you print it as a | |
75 | * string. | |
76 | */ | |
77 | len = 0; | |
78 | --- 4265,4271 ---- | |
79 | * or '**76' is transposed to '**N'( 'N' is ASCII value 76). | |
80 | * For EBCDIC you get different character values. | |
81 | * If no restrict is given after '**' the default is used. | |
82 | ! * Due to this technique the path looks awful if you print it as a | |
83 | * string. | |
84 | */ | |
85 | len = 0; | |
86 | *************** | |
87 | *** 4649,4655 **** | |
88 | && !mch_isdir(stackp->ffs_filearray[i])) | |
89 | continue; /* not a directory */ | |
90 | ||
91 | ! /* prepare the filename to be checked for existance | |
92 | * below */ | |
93 | STRCPY(file_path, stackp->ffs_filearray[i]); | |
94 | add_pathsep(file_path); | |
95 | --- 4654,4660 ---- | |
96 | && !mch_isdir(stackp->ffs_filearray[i])) | |
97 | continue; /* not a directory */ | |
98 | ||
99 | ! /* prepare the filename to be checked for existence | |
100 | * below */ | |
101 | STRCPY(file_path, stackp->ffs_filearray[i]); | |
102 | add_pathsep(file_path); | |
103 | *************** | |
104 | *** 5438,5444 **** | |
105 | #if defined(MSWIN) || defined(MSDOS) || defined(OS2) | |
106 | /* handle "\tmp" as absolute path */ | |
107 | || vim_ispathsep(ff_file_to_find[0]) | |
108 | ! /* handle "c:name" as absulute path */ | |
109 | || (ff_file_to_find[0] != NUL && ff_file_to_find[1] == ':') | |
110 | #endif | |
111 | #ifdef AMIGA | |
112 | --- 5443,5449 ---- | |
113 | #if defined(MSWIN) || defined(MSDOS) || defined(OS2) | |
114 | /* handle "\tmp" as absolute path */ | |
115 | || vim_ispathsep(ff_file_to_find[0]) | |
116 | ! /* handle "c:name" as absolute path */ | |
117 | || (ff_file_to_find[0] != NUL && ff_file_to_find[1] == ':') | |
118 | #endif | |
119 | #ifdef AMIGA | |
120 | *************** | |
121 | *** 5681,5687 **** | |
122 | p2 = (char_u *)base + (j + gap) * elm_size; | |
123 | if ((*cmp)((void *)p1, (void *)p2) <= 0) | |
124 | break; | |
125 | ! /* Exchange the elemets. */ | |
126 | mch_memmove(buf, p1, elm_size); | |
127 | mch_memmove(p1, p2, elm_size); | |
128 | mch_memmove(p2, buf, elm_size); | |
129 | --- 5686,5692 ---- | |
130 | p2 = (char_u *)base + (j + gap) * elm_size; | |
131 | if ((*cmp)((void *)p1, (void *)p2) <= 0) | |
132 | break; | |
133 | ! /* Exchange the elements. */ | |
134 | mch_memmove(buf, p1, elm_size); | |
135 | mch_memmove(p1, p2, elm_size); | |
136 | mch_memmove(p2, buf, elm_size); | |
137 | *** ../vim-7.2.289/src/version.c 2009-11-11 16:23:37.000000000 +0100 | |
138 | --- src/version.c 2009-11-11 16:54:53.000000000 +0100 | |
139 | *************** | |
140 | *** 683,684 **** | |
141 | --- 683,686 ---- | |
142 | { /* Add new patch number below this line */ | |
143 | + /**/ | |
144 | + 290, | |
145 | /**/ | |
146 | ||
147 | -- | |
148 | ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of Camelot. | |
149 | King of all Britons, defeator of the Saxons, sovereign of all England! | |
150 | [Pause] | |
151 | SOLDIER: Get away! | |
152 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
153 | ||
154 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
155 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
156 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
157 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |