Mirror of the Vim source from https://github.com/vim/vim
リビジョン | f41b6108e46b7cb3794b2a3680f2ce91b402fb21 (tree) |
---|---|
日時 | 2008-07-08 04:23:37 |
作者 | vimboss |
コミッター | vimboss |
updated for version 7.2a-016
@@ -677,6 +677,8 @@ | ||
677 | 677 | static int included_patches[] = |
678 | 678 | { /* Add new patch number below this line */ |
679 | 679 | /**/ |
680 | + 16, | |
681 | +/**/ | |
680 | 682 | 15, |
681 | 683 | /**/ |
682 | 684 | 14, |
@@ -149,12 +149,18 @@ | ||
149 | 149 | case Ctrl_V: |
150 | 150 | case 'v': |
151 | 151 | CHECK_CMDWIN |
152 | -#ifdef FEAT_VISUAL | |
152 | +# ifdef FEAT_VISUAL | |
153 | 153 | reset_VIsual_and_resel(); /* stop Visual mode */ |
154 | -#endif | |
155 | -#ifdef FEAT_GUI | |
154 | +# endif | |
155 | +# ifdef FEAT_QUICKFIX | |
156 | + /* When splitting the quickfix window open a new buffer in it, | |
157 | + * don't replicate the quickfix buffer. */ | |
158 | + if (bt_quickfix(curbuf)) | |
159 | + goto newwindow; | |
160 | +# endif | |
161 | +# ifdef FEAT_GUI | |
156 | 162 | need_mouse_correct = TRUE; |
157 | -#endif | |
163 | +# endif | |
158 | 164 | win_split((int)Prenum, WSP_VERT); |
159 | 165 | break; |
160 | 166 | #endif |
@@ -168,7 +174,8 @@ | ||
168 | 174 | #endif |
169 | 175 | STRCPY(cbuf, "split #"); |
170 | 176 | if (Prenum) |
171 | - sprintf((char *)cbuf + 7, "%ld", Prenum); | |
177 | + vim_snprintf((char *)cbuf + 7, sizeof(cbuf) - 7, | |
178 | + "%ld", Prenum); | |
172 | 179 | do_cmdline_cmd(cbuf); |
173 | 180 | break; |
174 | 181 |
@@ -183,9 +190,14 @@ | ||
183 | 190 | newwindow: |
184 | 191 | #endif |
185 | 192 | if (Prenum) |
186 | - sprintf((char *)cbuf, "%ld", Prenum); /* window height */ | |
193 | + /* window height */ | |
194 | + vim_snprintf((char *)cbuf, sizeof(cbuf) - 5, "%ld", Prenum); | |
187 | 195 | else |
188 | 196 | cbuf[0] = NUL; |
197 | +#if defined(FEAT_VERTSPLIT) && defined(FEAT_QUICKFIX) | |
198 | + if (nchar == 'v' || nchar == Ctrl_V) | |
199 | + STRCAT(cbuf, "v"); | |
200 | +#endif | |
189 | 201 | STRCAT(cbuf, "new"); |
190 | 202 | do_cmdline_cmd(cbuf); |
191 | 203 | break; |