Changeset c308796
- Timestamp:
- Nov 2, 2006, 10:20:16 AM (18 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 0a00997
- Parents:
- 2a5f085
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
patches/vim-7.0-fixes-17.patch
r2a5f085 rc308796 1 1 Submitted By: Jim Gifford (jim at linuxfromscratch dot org) 2 Date: 2006-1 0-252 Date: 2006-11-03 3 3 Initial Package Version: 7.0 4 4 Origin: Upstream 5 5 Upstream Status: Applied 6 Description: Contains all upstream patches up to 7.0.15 26 Description: Contains all upstream patches up to 7.0.158 7 7 The following patches were skipped 8 005 027 028 032 045 057 065 074 108 130 131 132 138 8 005 027 028 032 045 057 065 074 108 130 131 132 138 156 9 9 10 10 diff -Naur vim70.orig/configure vim70/configure 11 11 --- vim70.orig/configure 2004-07-05 02:02:24.000000000 -0700 12 +++ vim70/configure 2006-1 0-25 19:55:26.000000000 -070012 +++ vim70/configure 2006-11-02 10:13:07.000000000 -0800 13 13 @@ -3,4 +3,4 @@ 14 14 # This is just a stub for the Unix configure script, to provide support for … … 19 19 diff -Naur vim70.orig/runtime/autoload/ccomplete.vim vim70/runtime/autoload/ccomplete.vim 20 20 --- vim70.orig/runtime/autoload/ccomplete.vim 2006-05-03 07:35:56.000000000 -0700 21 +++ vim70/runtime/autoload/ccomplete.vim 2006-1 0-25 19:55:18.000000000 -070021 +++ vim70/runtime/autoload/ccomplete.vim 2006-11-02 10:12:56.000000000 -0800 22 22 @@ -1,7 +1,7 @@ 23 23 " Vim completion script … … 40 40 diff -Naur vim70.orig/runtime/autoload/gzip.vim vim70/runtime/autoload/gzip.vim 41 41 --- vim70.orig/runtime/autoload/gzip.vim 2006-03-31 07:12:15.000000000 -0800 42 +++ vim70/runtime/autoload/gzip.vim 2006-1 0-25 19:55:42.000000000 -070042 +++ vim70/runtime/autoload/gzip.vim 2006-11-02 10:13:23.000000000 -0800 43 43 @@ -1,6 +1,6 @@ 44 44 " Vim autoload file for editing compressed files. … … 101 101 diff -Naur vim70.orig/runtime/autoload/paste.vim vim70/runtime/autoload/paste.vim 102 102 --- vim70.orig/runtime/autoload/paste.vim 2006-04-21 11:31:01.000000000 -0700 103 +++ vim70/runtime/autoload/paste.vim 2006-1 0-25 19:55:22.000000000 -0700103 +++ vim70/runtime/autoload/paste.vim 2006-11-02 10:13:03.000000000 -0800 104 104 @@ -1,6 +1,6 @@ 105 105 " Vim support file to help with paste mappings and menus … … 121 121 diff -Naur vim70.orig/runtime/autoload/spellfile.vim vim70/runtime/autoload/spellfile.vim 122 122 --- vim70.orig/runtime/autoload/spellfile.vim 2006-02-01 04:12:24.000000000 -0800 123 +++ vim70/runtime/autoload/spellfile.vim 2006-1 0-25 19:55:36.000000000 -0700123 +++ vim70/runtime/autoload/spellfile.vim 2006-11-02 10:13:16.000000000 -0800 124 124 @@ -1,9 +1,9 @@ 125 125 " Vim script to download a missing spell file … … 177 177 diff -Naur vim70.orig/runtime/doc/eval.txt vim70/runtime/doc/eval.txt 178 178 --- vim70.orig/runtime/doc/eval.txt 2006-05-07 05:16:44.000000000 -0700 179 +++ vim70/runtime/doc/eval.txt 2006-1 0-25 19:55:42.000000000 -0700179 +++ vim70/runtime/doc/eval.txt 2006-11-02 10:13:37.000000000 -0800 180 180 @@ -1,4 +1,4 @@ 181 181 -*eval.txt* For Vim version 7.0. Last change: 2006 May 06 182 +*eval.txt* For Vim version 7.0. Last change: 2006 Sep 22182 +*eval.txt* For Vim version 7.0. Last change: 2006 Nov 01 183 183 184 184 185 185 VIM REFERENCE MANUAL by Bram Moolenaar 186 @@ -1709,6 +1709,8 @@ 186 @@ -1374,6 +1374,21 @@ 187 'guitabtooltip'. Only valid while one of these expressions is 188 being evaluated. Read-only when in the |sandbox|. 189 190 + *v:mouse_win* *mouse_win-variable* 191 +v:mouse_win Window number for a mouse click obtained with |getchar()|. 192 + First window has number 1, like with |winnr()|. The value is 193 + zero when there was no mouse button click. 194 + 195 + *v:mouse_lnum* *mouse_lnum-variable* 196 +v:mouse_lnum Line number for a mouse click obtained with |getchar()|. 197 + This is the text line number, not the screen line number. The 198 + value is zero when there was no mouse button click. 199 + 200 + *v:mouse_col* *mouse_col-variable* 201 +v:mouse_col Column number for a mouse click obtained with |getchar()|. 202 + This is the screen column number, like with |virtcol()|. The 203 + value is zero when there was no mouse button click. 204 + 205 *v:prevcount* *prevcount-variable* 206 v:prevcount The count given for the last but one Normal mode command. 207 This is the v:count value of the previous command. Useful if 208 @@ -1709,6 +1724,8 @@ 187 209 settabwinvar( {tabnr}, {winnr}, {varname}, {val}) set {varname} in window 188 210 {winnr} in tab page {tabnr} to {val} … … 193 215 sort( {list} [, {func}]) List sort {list}, using {func} to compare 194 216 soundfold( {word}) String sound-fold {word} 195 @@ -4434,6 +4436,21 @@ 217 @@ -2700,6 +2717,17 @@ 218 one-byte character it is the character itself as a number. 219 Use nr2char() to convert it to a String. 220 221 + When the user clicks a mouse button, the mouse event will be 222 + returned. The position can then be found in |v:mouse_col|, 223 + |v:mouse_lnum| and |v:mouse_win|. This example positions the 224 + mouse as it would normally happen: > 225 + let c = getchar() 226 + if c == "\<LeftMouse>" && v:mouse_win > 0 227 + exe v:mouse_win . "wincmd w" 228 + exe v:mouse_lnum 229 + exe "normal " . v:mouse_col . "|" 230 + endif 231 +< 232 There is no prompt, you will somehow have to make clear to the 233 user that a character has to be typed. 234 There is no mapping for the character. 235 @@ -4434,6 +4462,21 @@ 196 236 :call setwinvar(1, "&list", 0) 197 237 :call setwinvar(2, "myvar", "foobar") … … 217 257 diff -Naur vim70.orig/runtime/menu.vim vim70/runtime/menu.vim 218 258 --- vim70.orig/runtime/menu.vim 2006-04-17 06:47:28.000000000 -0700 219 +++ vim70/runtime/menu.vim 2006-1 0-25 19:55:41.000000000 -0700259 +++ vim70/runtime/menu.vim 2006-11-02 10:13:22.000000000 -0800 220 260 @@ -2,7 +2,7 @@ 221 261 " You can also use this as a start for your own set of menus. … … 284 324 diff -Naur vim70.orig/runtime/plugin/matchparen.vim vim70/runtime/plugin/matchparen.vim 285 325 --- vim70.orig/runtime/plugin/matchparen.vim 2006-04-27 06:31:26.000000000 -0700 286 +++ vim70/runtime/plugin/matchparen.vim 2006-1 0-25 19:55:39.000000000 -0700326 +++ vim70/runtime/plugin/matchparen.vim 2006-11-02 10:13:20.000000000 -0800 287 327 @@ -1,6 +1,6 @@ 288 328 " Vim plugin for showing matching parens … … 327 367 diff -Naur vim70.orig/runtime/scripts.vim vim70/runtime/scripts.vim 328 368 --- vim70.orig/runtime/scripts.vim 2006-03-28 11:30:49.000000000 -0800 329 +++ vim70/runtime/scripts.vim 2006-1 0-25 19:55:27.000000000 -0700369 +++ vim70/runtime/scripts.vim 2006-11-02 10:13:07.000000000 -0800 330 370 @@ -1,7 +1,7 @@ 331 371 " Vim support file to detect file types in scripts … … 352 392 diff -Naur vim70.orig/runtime/tutor/Makefile vim70/runtime/tutor/Makefile 353 393 --- vim70.orig/runtime/tutor/Makefile 2004-06-07 07:32:39.000000000 -0700 354 +++ vim70/runtime/tutor/Makefile 2006-1 0-25 19:55:40.000000000 -0700394 +++ vim70/runtime/tutor/Makefile 2006-11-02 10:13:20.000000000 -0800 355 395 @@ -2,8 +2,13 @@ 356 396 # … … 386 426 diff -Naur vim70.orig/runtime/tutor/tutor.gr.utf-8 vim70/runtime/tutor/tutor.gr.utf-8 387 427 --- vim70.orig/runtime/tutor/tutor.gr.utf-8 1969-12-31 16:00:00.000000000 -0800 388 +++ vim70/runtime/tutor/tutor.gr.utf-8 2006-1 0-25 19:55:40.000000000 -0700428 +++ vim70/runtime/tutor/tutor.gr.utf-8 2006-11-02 10:13:20.000000000 -0800 389 429 @@ -0,0 +1,815 @@ 390 430 +=============================================================================== … … 1419 1459 diff -Naur vim70.orig/runtime/tutor/tutor.ru.utf-8 vim70/runtime/tutor/tutor.ru.utf-8 1420 1460 --- vim70.orig/runtime/tutor/tutor.ru.utf-8 1969-12-31 16:00:00.000000000 -0800 1421 +++ vim70/runtime/tutor/tutor.ru.utf-8 2006-1 0-25 19:55:36.000000000 -07001461 +++ vim70/runtime/tutor/tutor.ru.utf-8 2006-11-02 10:13:17.000000000 -0800 1422 1462 @@ -0,0 +1,834 @@ 1423 1463 +=============================================================================== … … 2340 2380 diff -Naur vim70.orig/runtime/tutor/tutor.vim vim70/runtime/tutor/tutor.vim 2341 2381 --- vim70.orig/runtime/tutor/tutor.vim 2006-03-18 12:20:36.000000000 -0800 2342 +++ vim70/runtime/tutor/tutor.vim 2006-1 0-25 19:55:40.000000000 -07002382 +++ vim70/runtime/tutor/tutor.vim 2006-11-02 10:13:20.000000000 -0800 2343 2383 @@ -1,6 +1,6 @@ 2344 2384 " Vim tutor support file … … 2392 2432 diff -Naur vim70.orig/src/auto/configure vim70/src/auto/configure 2393 2433 --- vim70.orig/src/auto/configure 2006-05-04 03:46:19.000000000 -0700 2394 +++ vim70/src/auto/configure 2006-1 0-25 19:55:46.000000000 -07002434 +++ vim70/src/auto/configure 2006-11-02 10:13:27.000000000 -0800 2395 2435 @@ -4014,7 +4014,7 @@ 2396 2436 LDFLAGS=$ldflags_save … … 2433 2473 diff -Naur vim70.orig/src/buffer.c vim70/src/buffer.c 2434 2474 --- vim70.orig/src/buffer.c 2006-04-26 14:37:23.000000000 -0700 2435 +++ vim70/src/buffer.c 2006-1 0-25 19:55:48.000000000 -07002475 +++ vim70/src/buffer.c 2006-11-02 10:13:29.000000000 -0800 2436 2476 @@ -434,12 +434,8 @@ 2437 2477 if (usingNetbeans) … … 2575 2615 diff -Naur vim70.orig/src/configure vim70/src/configure 2576 2616 --- vim70.orig/src/configure 2006-05-07 07:17:49.000000000 -0700 2577 +++ vim70/src/configure 2006-1 0-25 19:55:26.000000000 -07002617 +++ vim70/src/configure 2006-11-02 10:13:07.000000000 -0800 2578 2618 @@ -2,5 +2,9 @@ 2579 2619 # run the automatically generated configure script … … 2588 2628 diff -Naur vim70.orig/src/configure.in vim70/src/configure.in 2589 2629 --- vim70.orig/src/configure.in 2006-05-04 03:46:11.000000000 -0700 2590 +++ vim70/src/configure.in 2006-1 0-25 19:55:46.000000000 -07002630 +++ vim70/src/configure.in 2006-11-02 10:13:27.000000000 -0800 2591 2631 @@ -508,7 +508,8 @@ 2592 2632 LDFLAGS=$ldflags_save … … 2631 2671 diff -Naur vim70.orig/src/edit.c vim70/src/edit.c 2632 2672 --- vim70.orig/src/edit.c 2006-05-07 04:48:51.000000000 -0700 2633 +++ vim70/src/edit.c 2006-1 0-25 19:55:46.000000000 -07002673 +++ vim70/src/edit.c 2006-11-02 10:13:49.000000000 -0800 2634 2674 @@ -129,7 +129,7 @@ 2635 2675 … … 3239 3279 } 3240 3280 #endif 3281 @@ -9074,6 +9204,10 @@ 3282 #ifdef FEAT_CINDENT 3283 can_cindent = TRUE; 3284 #endif 3285 +#ifdef FEAT_FOLDING 3286 + /* When inserting a line the cursor line must never be in a closed fold. */ 3287 + foldOpenCursor(); 3288 +#endif 3289 3290 return (!i); 3291 } 3241 3292 diff -Naur vim70.orig/src/eval.c vim70/src/eval.c 3242 3293 --- vim70.orig/src/eval.c 2006-05-05 10:15:26.000000000 -0700 3243 +++ vim70/src/eval.c 2006-10-25 19:55:55.000000000 -0700 3244 @@ -191,8 +191,6 @@ 3294 +++ vim70/src/eval.c 2006-11-02 10:13:45.000000000 -0800 3295 @@ -166,7 +166,6 @@ 3296 int uf_tm_count; /* nr of calls */ 3297 proftime_T uf_tm_total; /* time spend in function + children */ 3298 proftime_T uf_tm_self; /* time spend in function itself */ 3299 - proftime_T uf_tm_start; /* time at function call */ 3300 proftime_T uf_tm_children; /* time spent in children this call */ 3301 /* profiling the function per line */ 3302 int *uf_tml_count; /* nr of times line was executed */ 3303 @@ -191,8 +190,6 @@ 3245 3304 #define FC_RANGE 2 /* function accepts range */ 3246 3305 #define FC_DICT 4 /* Dict function, uses "self" */ … … 3251 3310 * All user-defined functions are found in this hashtable. 3252 3311 */ 3253 @@ -435,7 +433,7 @@ 3312 @@ -345,6 +342,9 @@ 3313 {VV_NAME("swapchoice", VAR_STRING), 0}, 3314 {VV_NAME("swapcommand", VAR_STRING), VV_RO}, 3315 {VV_NAME("char", VAR_STRING), VV_RO}, 3316 + {VV_NAME("mouse_win", VAR_NUMBER), 0}, 3317 + {VV_NAME("mouse_lnum", VAR_NUMBER), 0}, 3318 + {VV_NAME("mouse_col", VAR_NUMBER), 0}, 3319 }; 3320 3321 /* shorthand */ 3322 @@ -435,7 +435,7 @@ 3254 3323 static void set_ref_in_list __ARGS((list_T *l, int copyID)); 3255 3324 static void set_ref_in_item __ARGS((typval_T *tv, int copyID)); … … 3260 3329 static dictitem_T *dictitem_copy __ARGS((dictitem_T *org)); 3261 3330 static void dictitem_remove __ARGS((dict_T *dict, dictitem_T *item)); 3262 @@ -454,7 +45 2,7 @@3331 @@ -454,7 +454,7 @@ 3263 3332 static char_u *deref_func_name __ARGS((char_u *name, int *lenp)); 3264 3333 static int get_func_tv __ARGS((char_u *name, int len, typval_T *rettv, char_u **arg, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict)); … … 3269 3338 static void f_add __ARGS((typval_T *argvars, typval_T *rettv)); 3270 3339 static void f_append __ARGS((typval_T *argvars, typval_T *rettv)); 3271 @@ -622,6 +62 0,7 @@3340 @@ -622,6 +622,7 @@ 3272 3341 static void f_setreg __ARGS((typval_T *argvars, typval_T *rettv)); 3273 3342 static void f_settabwinvar __ARGS((typval_T *argvars, typval_T *rettv)); … … 3277 3346 static void f_sort __ARGS((typval_T *argvars, typval_T *rettv)); 3278 3347 static void f_soundfold __ARGS((typval_T *argvars, typval_T *rettv)); 3279 @@ -701,6 +70 0,7 @@3348 @@ -701,6 +702,7 @@ 3280 3349 static void list_one_var_a __ARGS((char_u *prefix, char_u *name, int type, char_u *string)); 3281 3350 static void set_var __ARGS((char_u *name, typval_T *varp, int copy)); … … 3285 3354 static void copy_tv __ARGS((typval_T *from, typval_T *to)); 3286 3355 static int item_copy __ARGS((typval_T *from, typval_T *to, int deep, int copyID)); 3287 @@ -2260,7 +226 0,7 @@3356 @@ -2260,7 +2262,7 @@ 3288 3357 EMSG(_(e_letunexp)); 3289 3358 else … … 3294 3363 3295 3364 p = get_tv_string_chk(tv); 3296 @@ -2269,7 +22 69,7 @@3365 @@ -2269,7 +2271,7 @@ 3297 3366 s = get_reg_contents(*arg == '@' ? '"' : *arg, TRUE, TRUE); 3298 3367 if (s != NULL) … … 3303 3372 } 3304 3373 } 3305 @@ -2278,7 +22 78,7 @@3374 @@ -2278,7 +2280,7 @@ 3306 3375 write_reg_contents(*arg == '@' ? '"' : *arg, p, -1, FALSE); 3307 3376 arg_end = arg + 1; … … 3312 3381 } 3313 3382 3314 @@ -3125,7 +312 5,12 @@3383 @@ -3125,7 +3127,12 @@ 3315 3384 funcdict_T fudi; 3316 3385 … … 3326 3395 return; 3327 3396 3328 @@ -3364,6 +33 69,8 @@3397 @@ -3364,6 +3371,8 @@ 3329 3398 hi = hash_find(ht, varname); 3330 3399 if (!HASHITEM_EMPTY(hi)) … … 3335 3404 return FAIL; 3336 3405 delete_var(ht, hi); 3337 @@ -4895,7 +490 2,7 @@3406 @@ -4895,7 +4904,7 @@ 3338 3407 { 3339 3408 if (list_append_tv(l, &item->li_tv) == FAIL) … … 3344 3413 } 3345 3414 item = item->li_next; 3346 @@ -5295,7 +530 2,7 @@3415 @@ -5295,7 +5304,7 @@ 3347 3416 EMSG2(_("E697: Missing end of List ']': %s"), *arg); 3348 3417 failret: … … 3353 3422 } 3354 3423 3355 @@ -5359,8 +536 6,8 @@3424 @@ -5359,8 +5368,8 @@ 3356 3425 list_unref(l) 3357 3426 list_T *l; … … 3364 3433 3365 3434 /* 3366 @@ -5368,14 +537 5,12 @@3435 @@ -5368,14 +5377,12 @@ 3367 3436 * Ignores the reference count. 3368 3437 */ … … 3382 3451 if (l->lv_used_prev == NULL) 3383 3452 first_list = l->lv_used_next; 3384 @@ -5388,7 +539 3,10 @@3453 @@ -5388,7 +5395,10 @@ 3385 3454 { 3386 3455 /* Remove the item before deleting it. */ … … 3394 3463 vim_free(l); 3395 3464 } 3396 @@ -5448,6 +545 6,8 @@3465 @@ -5448,6 +5458,8 @@ 3397 3466 { 3398 3467 listitem_T *item1, *item2; … … 3403 3472 return FALSE; 3404 3473 3405 @@ -5484,6 +549 4,8 @@3474 @@ -5484,6 +5496,8 @@ 3406 3475 dictitem_T *item2; 3407 3476 int todo; … … 3412 3481 return FALSE; 3413 3482 3414 @@ -5516,19 +55 28,29 @@3483 @@ -5516,19 +5530,29 @@ 3415 3484 { 3416 3485 char_u buf1[NUMBUFLEN], buf2[NUMBUFLEN]; … … 3446 3515 case VAR_FUNC: 3447 3516 return (tv1->vval.v_string != NULL 3448 @@ -6059,6 +608 1,10 @@3517 @@ -6059,6 +6083,10 @@ 3449 3518 tabpage_T *tp; 3450 3519 #endif … … 3457 3526 * 1. Go through all accessible variables and mark all lists and dicts 3458 3527 * with copyID. 3459 @@ -6097,7 +612 3,10 @@3528 @@ -6097,7 +6125,10 @@ 3460 3529 for (dd = first_dict; dd != NULL; ) 3461 3530 if (dd->dv_copyID != copyID) … … 3469 3538 3470 3539 /* restart, next dict may also have been freed */ 3471 @@ -6114,7 +614 3,10 @@3540 @@ -6114,7 +6145,10 @@ 3472 3541 for (ll = first_list; ll != NULL; ) 3473 3542 if (ll->lv_copyID != copyID && ll->lv_watch == NULL) … … 3481 3550 3482 3551 /* restart, next list may also have been freed */ 3483 @@ -6207,11 +62 39,12 @@3552 @@ -6207,11 +6241,12 @@ 3484 3553 d = (dict_T *)alloc(sizeof(dict_T)); 3485 3554 if (d != NULL) … … 3495 3564 hash_init(&d->dv_hashtab); 3496 3565 d->dv_lock = 0; 3497 @@ -6229,8 +626 2,8 @@3566 @@ -6229,8 +6264,8 @@ 3498 3567 dict_unref(d) 3499 3568 dict_T *d; … … 3506 3575 3507 3576 /* 3508 @@ -6238,16 +627 1,14 @@3577 @@ -6238,16 +6273,14 @@ 3509 3578 * Ignores the reference count. 3510 3579 */ … … 3526 3595 if (d->dv_used_prev == NULL) 3527 3596 first_dict = d->dv_used_next; 3528 @@ -6267,7 +6 298,10 @@3597 @@ -6267,7 +6300,10 @@ 3529 3598 * something recursive causing trouble. */ 3530 3599 di = HI2DI(hi); … … 3538 3607 } 3539 3608 } 3540 @@ -6718,7 +675 2,7 @@3609 @@ -6718,7 +6754,7 @@ 3541 3610 EMSG2(_("E723: Missing end of Dictionary '}': %s"), *arg); 3542 3611 failret: … … 3547 3616 } 3548 3617 3549 @@ -7139,6 +717 3,7 @@3618 @@ -7139,6 +7175,7 @@ 3550 3619 {"setreg", 2, 3, f_setreg}, 3551 3620 {"settabwinvar", 4, 4, f_settabwinvar}, … … 3555 3624 {"sort", 1, 2, f_sort}, 3556 3625 {"soundfold", 1, 1, f_soundfold}, 3557 @@ -7595,8 +763 0,8 @@3626 @@ -7595,8 +7632,8 @@ 3558 3627 * Give an error message with a function name. Handle <SNR> things. 3559 3628 */ … … 3566 3635 { 3567 3636 char_u *p; 3568 @@ -7605,7 +764 0,7 @@3637 @@ -7605,7 +7642,7 @@ 3569 3638 p = concat_str((char_u *)"<SNR>", name + 3); 3570 3639 else … … 3575 3644 vim_free(p); 3576 3645 } 3577 @@ -8252,6 +828 7,12 @@3646 @@ -8252,6 +8289,12 @@ 3578 3647 EMSG(_("E785: complete() can only be used in Insert mode")); 3579 3648 return; … … 3588 3657 { 3589 3658 EMSG(_(e_invarg)); 3590 @@ -9173,25 +921 4,25 @@3659 @@ -9173,25 +9216,25 @@ 3591 3660 typval_T save_key; 3592 3661 int rem; … … 3618 3687 } 3619 3688 3620 @@ -9223,7 +926 4,7 @@3689 @@ -9223,7 +9266,7 @@ 3621 3690 { 3622 3691 --todo; … … 3627 3696 vimvars[VV_KEY].vv_str = vim_strsave(di->di_key); 3628 3697 if (filter_map_one(&di->di_tv, expr, map, &rem) == FAIL 3629 @@ -9242,7 +928 3,7 @@3698 @@ -9242,7 +9285,7 @@ 3630 3699 { 3631 3700 for (li = l->lv_first; li != NULL; li = nli) … … 3636 3705 nli = li->li_next; 3637 3706 if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL 3638 @@ -9598,7 +96 39,9 @@3707 @@ -9598,7 +9641,9 @@ 3639 3708 typval_T *argvars; 3640 3709 typval_T *rettv; … … 3647 3716 3648 3717 /* 3649 @@ -9792,6 +983 5,9 @@3718 @@ -9792,6 +9837,9 @@ 3650 3719 varnumber_T n; 3651 3720 int error = FALSE; … … 3657 3726 ++allow_keys; 3658 3727 if (argvars[0].v_type == VAR_UNKNOWN) 3659 @@ -10412,20 +10458,14 @@ 3728 @@ -9809,6 +9857,10 @@ 3729 --no_mapping; 3730 --allow_keys; 3731 3732 + vimvars[VV_MOUSE_WIN].vv_nr = 0; 3733 + vimvars[VV_MOUSE_LNUM].vv_nr = 0; 3734 + vimvars[VV_MOUSE_COL].vv_nr = 0; 3735 + 3736 rettv->vval.v_number = n; 3737 if (IS_SPECIAL(n) || mod_mask != 0) 3738 { 3739 @@ -9837,6 +9889,53 @@ 3740 temp[i++] = NUL; 3741 rettv->v_type = VAR_STRING; 3742 rettv->vval.v_string = vim_strsave(temp); 3743 + 3744 +#ifdef FEAT_MOUSE 3745 + if (n == K_LEFTMOUSE 3746 + || n == K_LEFTMOUSE_NM 3747 + || n == K_LEFTDRAG 3748 + || n == K_LEFTRELEASE 3749 + || n == K_LEFTRELEASE_NM 3750 + || n == K_MIDDLEMOUSE 3751 + || n == K_MIDDLEDRAG 3752 + || n == K_MIDDLERELEASE 3753 + || n == K_RIGHTMOUSE 3754 + || n == K_RIGHTDRAG 3755 + || n == K_RIGHTRELEASE 3756 + || n == K_X1MOUSE 3757 + || n == K_X1DRAG 3758 + || n == K_X1RELEASE 3759 + || n == K_X2MOUSE 3760 + || n == K_X2DRAG 3761 + || n == K_X2RELEASE 3762 + || n == K_MOUSEDOWN 3763 + || n == K_MOUSEUP) 3764 + { 3765 + int row = mouse_row; 3766 + int col = mouse_col; 3767 + win_T *win; 3768 + linenr_T lnum; 3769 +# ifdef FEAT_WINDOWS 3770 + win_T *wp; 3771 +# endif 3772 + int n = 1; 3773 + 3774 + if (row >= 0 && col >= 0) 3775 + { 3776 + /* Find the window at the mouse coordinates and compute the 3777 + * text position. */ 3778 + win = mouse_find_win(&row, &col); 3779 + (void)mouse_comp_pos(win, &row, &col, &lnum); 3780 +# ifdef FEAT_WINDOWS 3781 + for (wp = firstwin; wp != win; wp = wp->w_next) 3782 + ++n; 3783 +# endif 3784 + vimvars[VV_MOUSE_WIN].vv_nr = n; 3785 + vimvars[VV_MOUSE_LNUM].vv_nr = lnum; 3786 + vimvars[VV_MOUSE_COL].vv_nr = col + 1; 3787 + } 3788 + } 3789 +#endif 3790 } 3791 } 3792 3793 @@ -10412,20 +10511,14 @@ 3660 3794 3661 3795 if (win != NULL && varname != NULL) … … 3684 3818 { 3685 3819 if (*varname == NUL) 3686 @@ -10438,6 +10 478,10 @@3820 @@ -10438,6 +10531,10 @@ 3687 3821 if (v != NULL) 3688 3822 copy_tv(&v->di_tv, rettv); … … 3695 3829 3696 3830 --emsg_off; 3697 @@ -11312,14 +11 356,19 @@3831 @@ -11312,14 +11409,19 @@ 3698 3832 3699 3833 static int inputsecret_flag = 0; … … 3718 3852 char_u *prompt = get_tv_string_chk(&argvars[0]); 3719 3853 char_u *p = NULL; 3720 @@ -11369,10 +114 18,10 @@3854 @@ -11369,10 +11471,10 @@ 3721 3855 if (defstr != NULL) 3722 3856 stuffReadbuffSpec(defstr); … … 3731 3865 3732 3866 rettv->vval.v_string = NULL; 3733 @@ -11404,6 +11 453,18 @@3867 @@ -11404,6 +11506,18 @@ 3734 3868 } 3735 3869 … … 3750 3884 */ 3751 3885 static void 3752 @@ -11443,7 +115 04,7 @@3886 @@ -11443,7 +11557,7 @@ 3753 3887 } 3754 3888 else … … 3759 3893 3760 3894 /* 3761 @@ -11471,6 +115 32,7 @@3895 @@ -11471,6 +11585,7 @@ 3762 3896 } 3763 3897 … … 3767 3901 msg_scroll = TRUE; 3768 3902 msg_clr_eos(); 3769 @@ -13250,7 +133 12,7 @@3903 @@ -13250,7 +13365,7 @@ 3770 3904 if (argvars[2].v_type != VAR_UNKNOWN) 3771 3905 EMSG2(_(e_toomanyarg), "remove()"); … … 3776 3910 key = get_tv_string_chk(&argvars[1]); 3777 3911 if (key != NULL) 3778 @@ -13270,7 +133 32,7 @@3912 @@ -13270,7 +13385,7 @@ 3779 3913 else if (argvars[0].v_type != VAR_LIST) 3780 3914 EMSG2(_(e_listdictarg), "remove()"); … … 3785 3919 int error = FALSE; 3786 3920 3787 @@ -14157,11 +142 19,7 @@3921 @@ -14157,11 +14272,7 @@ 3788 3922 typval_T *rettv; 3789 3923 { … … 3797 3931 typval_T *varp; 3798 3932 char_u nbuf[NUMBUFLEN]; 3799 @@ -14178,12 +142 36,7 @@3933 @@ -14178,12 +14289,7 @@ 3800 3934 if (buf != NULL && varname != NULL && varp != NULL) 3801 3935 { … … 3810 3944 if (*varname == '&') 3811 3945 { 3812 @@ -14210,11 +14 263,7 @@3946 @@ -14210,11 +14316,7 @@ 3813 3947 } 3814 3948 … … 3822 3956 } 3823 3957 3824 @@ -14582,6 +146 31,18 @@3958 @@ -14582,6 +14684,18 @@ 3825 3959 } 3826 3960 … … 3841 3975 */ 3842 3976 static void 3843 @@ -16173,7 +162 34,7 @@3977 @@ -16173,7 +16287,7 @@ 3844 3978 curwin->w_curswant = get_dict_number(dict, (char_u *)"curswant"); 3845 3979 curwin->w_set_curswant = FALSE; … … 3850 3984 curwin->w_topfill = get_dict_number(dict, (char_u *)"topfill"); 3851 3985 #endif 3852 @@ -16218,6 +16 279,7 @@3986 @@ -16218,6 +16332,7 @@ 3853 3987 #ifdef FEAT_VIRTUALEDIT 3854 3988 dict_add_nr_str(dict, "coladd", (long)curwin->w_cursor.coladd, NULL); … … 3858 3992 3859 3993 dict_add_nr_str(dict, "topline", (long)curwin->w_topline, NULL); 3860 @@ -16438,9 +165 00,12 @@3994 @@ -16438,9 +16553,12 @@ 3861 3995 long i = 0; 3862 3996 long n; … … 3874 4008 3875 4009 if (fnump != NULL) 3876 @@ -16466,8 +165 31,9 @@4010 @@ -16466,8 +16584,9 @@ 3877 4011 #ifdef FEAT_VIRTUALEDIT 3878 4012 n = list_find_nr(l, i, NULL); … … 3886 4020 3887 4021 return OK; 3888 @@ -17759,6 +178 25,13 @@4022 @@ -17759,6 +17878,13 @@ 3889 4023 } 3890 4024 else /* add a new variable */ … … 3900 4034 for (p = varname; *p != NUL; ++p) 3901 4035 if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p)) 3902 @@ -17792,7 +17 865,7 @@4036 @@ -17792,7 +17918,7 @@ 3903 4037 } 3904 4038 … … 3909 4043 */ 3910 4044 static int 3911 @@ -17814,6 +17 887,23 @@4045 @@ -17814,6 +17940,23 @@ 3912 4046 } 3913 4047 … … 3933 4067 * Also give an error message, using "name". 3934 4068 */ 3935 @@ -18786,6 +18 876,7 @@4069 @@ -18786,6 +18929,7 @@ 3936 4070 if (dict_add(fudi.fd_dict, fudi.fd_di) == FAIL) 3937 4071 { … … 3941 4075 } 3942 4076 } 3943 @@ -18963,7 +19 054,8 @@4077 @@ -18963,7 +19107,8 @@ 3944 4078 else if (lead > 0) 3945 4079 { … … 3951 4085 /* It's "s:" or "<SID>" */ 3952 4086 if (current_SID <= 0) 3953 @@ -19685,6 +19777,7 @@ 4087 @@ -19618,6 +19763,7 @@ 4088 char_u *name; 4089 #ifdef FEAT_PROFILE 4090 proftime_T wait_start; 4091 + proftime_T call_start; 4092 #endif 4093 4094 /* If depth of calling is getting too high, don't execute the function */ 4095 @@ -19685,6 +19831,7 @@ 3954 4096 v->di_tv.vval.v_list = &fc.l_varlist; 3955 4097 vim_memset(&fc.l_varlist, 0, sizeof(list_T)); … … 3959 4101 /* 3960 4102 * Set a:firstline to "firstline" and a:lastline to "lastline". 3961 @@ -19761,7 +19 854,7 @@4103 @@ -19761,7 +19908,7 @@ 3962 4104 if (p_verbose >= 14) 3963 4105 { … … 3968 4110 3969 4111 msg_puts((char_u *)"("); 3970 @@ -19773,8 +19 866,8 @@4112 @@ -19773,8 +19920,8 @@ 3971 4113 msg_outnum((long)argvars[i].vval.v_number); 3972 4114 else … … 3979 4121 vim_free(tofree); 3980 4122 } 3981 @@ -19852,13 +19945,13 @@ 4123 @@ -19796,7 +19943,7 @@ 4124 || (fc.caller != NULL && &fc.caller->func->uf_profiling)) 4125 { 4126 ++fp->uf_tm_count; 4127 - profile_start(&fp->uf_tm_start); 4128 + profile_start(&call_start); 4129 profile_zero(&fp->uf_tm_children); 4130 } 4131 script_prof_save(&wait_start); 4132 @@ -19826,14 +19973,14 @@ 4133 if (do_profiling == PROF_YES && (fp->uf_profiling 4134 || (fc.caller != NULL && &fc.caller->func->uf_profiling))) 4135 { 4136 - profile_end(&fp->uf_tm_start); 4137 - profile_sub_wait(&wait_start, &fp->uf_tm_start); 4138 - profile_add(&fp->uf_tm_total, &fp->uf_tm_start); 4139 - profile_self(&fp->uf_tm_self, &fp->uf_tm_start, &fp->uf_tm_children); 4140 + profile_end(&call_start); 4141 + profile_sub_wait(&wait_start, &call_start); 4142 + profile_add(&fp->uf_tm_total, &call_start); 4143 + profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children); 4144 if (fc.caller != NULL && &fc.caller->func->uf_profiling) 4145 { 4146 - profile_add(&fc.caller->func->uf_tm_children, &fp->uf_tm_start); 4147 - profile_add(&fc.caller->func->uf_tml_children, &fp->uf_tm_start); 4148 + profile_add(&fc.caller->func->uf_tm_children, &call_start); 4149 + profile_add(&fc.caller->func->uf_tml_children, &call_start); 4150 } 4151 } 4152 #endif 4153 @@ -19852,13 +19999,13 @@ 3982 4154 else 3983 4155 { … … 3997 4169 diff -Naur vim70.orig/src/ex_cmds2.c vim70/src/ex_cmds2.c 3998 4170 --- vim70.orig/src/ex_cmds2.c 2006-04-17 03:19:07.000000000 -0700 3999 +++ vim70/src/ex_cmds2.c 2006-1 0-25 19:55:34.000000000 -07004171 +++ vim70/src/ex_cmds2.c 2006-11-02 10:13:13.000000000 -0800 4000 4172 @@ -3648,13 +3648,13 @@ 4001 4173 * Return FALSE when not sourcing a file. … … 4018 4190 diff -Naur vim70.orig/src/ex_cmds.c vim70/src/ex_cmds.c 4019 4191 --- vim70.orig/src/ex_cmds.c 2006-04-22 11:56:56.000000000 -0700 4020 +++ vim70/src/ex_cmds.c 2006-1 0-25 19:55:39.000000000 -07004192 +++ vim70/src/ex_cmds.c 2006-11-02 10:13:19.000000000 -0800 4021 4193 @@ -95,7 +95,10 @@ 4022 4194 _("<%s>%s%s %d, Hex %02x, Octal %03o"), … … 4129 4301 diff -Naur vim70.orig/src/ex_cmds.h vim70/src/ex_cmds.h 4130 4302 --- vim70.orig/src/ex_cmds.h 2006-04-07 02:44:46.000000000 -0700 4131 +++ vim70/src/ex_cmds.h 2006-1 0-25 19:55:22.000000000 -07004303 +++ vim70/src/ex_cmds.h 2006-11-02 10:13:02.000000000 -0800 4132 4304 @@ -262,7 +262,7 @@ 4133 4305 EX(CMD_comclear, "comclear", ex_comclear, … … 4141 4313 diff -Naur vim70.orig/src/ex_docmd.c vim70/src/ex_docmd.c 4142 4314 --- vim70.orig/src/ex_docmd.c 2006-05-05 09:33:19.000000000 -0700 4143 +++ vim70/src/ex_docmd.c 2006-1 0-25 19:55:51.000000000 -07004315 +++ vim70/src/ex_docmd.c 2006-11-02 10:13:29.000000000 -0800 4144 4316 @@ -58,9 +58,9 @@ 4145 4317 #endif … … 4561 4733 diff -Naur vim70.orig/src/ex_getln.c vim70/src/ex_getln.c 4562 4734 --- vim70.orig/src/ex_getln.c 2006-04-30 08:32:01.000000000 -0700 4563 +++ vim70/src/ex_getln.c 2006-1 0-25 19:55:47.000000000 -07004735 +++ vim70/src/ex_getln.c 2006-11-02 10:13:28.000000000 -0800 4564 4736 @@ -86,7 +86,7 @@ 4565 4737 static void draw_cmdline __ARGS((int start, int len)); … … 4684 4856 diff -Naur vim70.orig/src/fileio.c vim70/src/fileio.c 4685 4857 --- vim70.orig/src/fileio.c 2006-04-30 08:28:57.000000000 -0700 4686 +++ vim70/src/fileio.c 2006-1 0-25 19:55:41.000000000 -07004858 +++ vim70/src/fileio.c 2006-11-02 10:13:22.000000000 -0800 4687 4859 @@ -316,6 +316,9 @@ 4688 4860 * display the line. */ … … 4804 4976 /* 4805 4977 * Try matching a filename with a "pattern" ("prog" is NULL), or use the 4978 diff -Naur vim70.orig/src/fold.c vim70/src/fold.c 4979 --- vim70.orig/src/fold.c 2006-04-22 12:35:56.000000000 -0700 4980 +++ vim70/src/fold.c 2006-11-02 10:13:33.000000000 -0800 4981 @@ -2971,7 +2971,11 @@ 4982 else 4983 flp->lvl = get_indent_buf(buf, lnum) / buf->b_p_sw; 4984 if (flp->lvl > flp->wp->w_p_fdn) 4985 + { 4986 flp->lvl = flp->wp->w_p_fdn; 4987 + if (flp->lvl < 0) 4988 + flp->lvl = 0; 4989 + } 4990 } 4991 4992 /* foldlevelDiff() {{{2 */ 4806 4993 diff -Naur vim70.orig/src/getchar.c vim70/src/getchar.c 4807 4994 --- vim70.orig/src/getchar.c 2006-05-03 10:29:21.000000000 -0700 4808 +++ vim70/src/getchar.c 2006-1 0-25 19:55:43.000000000 -07004995 +++ vim70/src/getchar.c 2006-11-02 10:13:23.000000000 -0800 4809 4996 @@ -1451,7 +1451,8 @@ 4810 4997 { … … 4892 5079 diff -Naur vim70.orig/src/globals.h vim70/src/globals.h 4893 5080 --- vim70.orig/src/globals.h 2006-04-30 06:16:23.000000000 -0700 4894 +++ vim70/src/globals.h 2006-1 0-25 19:55:45.000000000 -07005081 +++ vim70/src/globals.h 2006-11-02 10:13:25.000000000 -0800 4895 5082 @@ -166,6 +166,7 @@ 4896 5083 EXTERN int emsg_off INIT(= 0); /* don't display errors for now, … … 4932 5119 diff -Naur vim70.orig/src/gui_at_fs.c vim70/src/gui_at_fs.c 4933 5120 --- vim70.orig/src/gui_at_fs.c 2005-07-09 04:30:17.000000000 -0700 4934 +++ vim70/src/gui_at_fs.c 2006-1 0-25 19:55:20.000000000 -07005121 +++ vim70/src/gui_at_fs.c 2006-11-02 10:13:00.000000000 -0800 4935 5122 @@ -1861,27 +1861,27 @@ 4936 5123 XtPointer pnew; … … 5048 5235 diff -Naur vim70.orig/src/gui_beval.c vim70/src/gui_beval.c 5049 5236 --- vim70.orig/src/gui_beval.c 2006-05-04 12:29:51.000000000 -0700 5050 +++ vim70/src/gui_beval.c 2006-1 0-25 19:55:34.000000000 -07005237 +++ vim70/src/gui_beval.c 2006-11-02 10:13:14.000000000 -0800 5051 5238 @@ -926,7 +926,7 @@ 5052 5239 # define IS_NONPRINTABLE(c) (((c) < 0x20 && (c) != TAB && (c) != NL) \ … … 5087 5274 diff -Naur vim70.orig/src/gui.c vim70/src/gui.c 5088 5275 --- vim70.orig/src/gui.c 2006-05-03 04:00:59.000000000 -0700 5089 +++ vim70/src/gui.c 2006-1 0-25 19:55:45.000000000 -07005276 +++ vim70/src/gui.c 2006-11-02 10:13:25.000000000 -0800 5090 5277 @@ -187,9 +187,10 @@ 5091 5278 #endif … … 5190 5377 diff -Naur vim70.orig/src/gui_gtk.c vim70/src/gui_gtk.c 5191 5378 --- vim70.orig/src/gui_gtk.c 2006-05-05 04:52:52.000000000 -0700 5192 +++ vim70/src/gui_gtk.c 2006-1 0-25 19:56:06.000000000 -07005379 +++ vim70/src/gui_gtk.c 2006-11-02 10:13:29.000000000 -0800 5193 5380 @@ -957,15 +957,15 @@ 5194 5381 get_menu_position(vimmenu_T *menu) … … 5288 5475 diff -Naur vim70.orig/src/gui_gtk_x11.c vim70/src/gui_gtk_x11.c 5289 5476 --- vim70.orig/src/gui_gtk_x11.c 2006-05-04 23:58:59.000000000 -0700 5290 +++ vim70/src/gui_gtk_x11.c 2006-1 0-25 19:55:34.000000000 -07005477 +++ vim70/src/gui_gtk_x11.c 2006-11-02 10:13:14.000000000 -0800 5291 5478 @@ -3233,12 +3233,12 @@ 5292 5479 on_select_tab( … … 5353 5540 diff -Naur vim70.orig/src/gui_xmebw.c vim70/src/gui_xmebw.c 5354 5541 --- vim70.orig/src/gui_xmebw.c 2006-04-30 08:32:32.000000000 -0700 5355 +++ vim70/src/gui_xmebw.c 2006-1 0-25 19:56:09.000000000 -07005542 +++ vim70/src/gui_xmebw.c 2006-11-02 10:13:29.000000000 -0800 5356 5543 @@ -47,13 +47,13 @@ 5357 5544 #include "gui_xmebwp.h" … … 5482 5669 diff -Naur vim70.orig/src/hardcopy.c vim70/src/hardcopy.c 5483 5670 --- vim70.orig/src/hardcopy.c 2006-05-04 03:09:58.000000000 -0700 5484 +++ vim70/src/hardcopy.c 2006-1 0-25 19:55:34.000000000 -07005671 +++ vim70/src/hardcopy.c 2006-11-02 10:13:14.000000000 -0800 5485 5672 @@ -1794,29 +1794,27 @@ 5486 5673 static int … … 5585 5772 diff -Naur vim70.orig/src/if_cscope.c vim70/src/if_cscope.c 5586 5773 --- vim70.orig/src/if_cscope.c 2006-04-18 01:54:15.000000000 -0700 5587 +++ vim70/src/if_cscope.c 2006-1 0-25 19:55:34.000000000 -07005774 +++ vim70/src/if_cscope.c 2006-11-02 10:13:29.000000000 -0800 5588 5775 @@ -989,8 +989,7 @@ 5589 5776 { … … 5596 5783 char cmdletter; 5597 5784 char *qfpos; 5598 @@ -1141,6 +1140,9 @@ 5785 @@ -1101,38 +1100,44 @@ 5786 if (qfpos != NULL && *qfpos != '0' && totmatches > 0) 5787 { 5788 /* fill error list */ 5789 - FILE *f; 5790 - char_u *tmp = vim_tempname('c'); 5791 + FILE *f; 5792 + char_u *tmp = vim_tempname('c'); 5793 qf_info_T *qi = NULL; 5794 win_T *wp = NULL; 5795 5796 f = mch_fopen((char *)tmp, "w"); 5797 - cs_file_results(f, nummatches); 5798 - fclose(f); 5799 - if (use_ll) /* Use location list */ 5800 - wp = curwin; 5801 - /* '-' starts a new error list */ 5802 - if (qf_init(wp, tmp, (char_u *)"%f%*\\t%l%*\\t%m", *qfpos == '-') > 0) 5803 + if (f == NULL) 5804 + EMSG2(_(e_notopen), tmp); 5805 + else 5806 { 5807 -# ifdef FEAT_WINDOWS 5808 - if (postponed_split != 0) 5809 + cs_file_results(f, nummatches); 5810 + fclose(f); 5811 + if (use_ll) /* Use location list */ 5812 + wp = curwin; 5813 + /* '-' starts a new error list */ 5814 + if (qf_init(wp, tmp, (char_u *)"%f%*\\t%l%*\\t%m", 5815 + *qfpos == '-') > 0) 5816 { 5817 - win_split(postponed_split > 0 ? postponed_split : 0, 5818 +# ifdef FEAT_WINDOWS 5819 + if (postponed_split != 0) 5820 + { 5821 + win_split(postponed_split > 0 ? postponed_split : 0, 5822 postponed_split_flags); 5823 # ifdef FEAT_SCROLLBIND 5824 - curwin->w_p_scb = FALSE; 5825 + curwin->w_p_scb = FALSE; 5826 # endif 5827 - postponed_split = 0; 5828 - } 5829 + postponed_split = 0; 5830 + } 5831 # endif 5832 - if (use_ll) 5833 - /* 5834 - * In the location list window, use the displayed location 5835 - * list. Otherwise, use the location list for the window. 5836 - */ 5837 - qi = (bt_quickfix(wp->w_buffer) && wp->w_llist_ref != NULL) ? 5838 - wp->w_llist_ref : wp->w_llist; 5839 - qf_jump(qi, 0, 0, forceit); 5840 + if (use_ll) 5841 + /* 5842 + * In the location list window, use the displayed location 5843 + * list. Otherwise, use the location list for the window. 5844 + */ 5845 + qi = (bt_quickfix(wp->w_buffer) && wp->w_llist_ref != NULL) 5846 + ? wp->w_llist_ref : wp->w_llist; 5847 + qf_jump(qi, 0, 0, forceit); 5848 + } 5849 } 5850 mch_remove(tmp); 5851 vim_free(tmp); 5852 @@ -1141,6 +1146,9 @@ 5599 5853 else 5600 5854 #endif /* FEAT_QUICKFIX */ … … 5606 5860 cs_fill_results((char *)pat, totmatches, nummatches, &matches, 5607 5861 &contexts, &matched); 5862 @@ -1721,7 +1729,7 @@ 5863 continue; 5864 5865 context = (char *)alloc((unsigned)strlen(cntx)+5); 5866 - if (context==NULL) 5867 + if (context == NULL) 5868 continue; 5869 5870 if (strcmp(cntx, "<global>")==0) 5871 @@ -1729,7 +1737,7 @@ 5872 else 5873 sprintf(context, "<<%s>>", cntx); 5874 5875 - if (search==NULL) 5876 + if (search == NULL) 5877 fprintf(f, "%s\t%s\t%s\n", fullname, slno, context); 5878 else 5879 fprintf(f, "%s\t%s\t%s %s\n", fullname, slno, context, search); 5608 5880 diff -Naur vim70.orig/src/if_perl.xs vim70/src/if_perl.xs 5609 5881 --- vim70.orig/src/if_perl.xs 2006-03-06 10:57:16.000000000 -0800 5610 +++ vim70/src/if_perl.xs 2006-1 0-25 19:55:31.000000000 -07005882 +++ vim70/src/if_perl.xs 2006-11-02 10:13:10.000000000 -0800 5611 5883 @@ -155,8 +155,8 @@ 5612 5884 static int (*perl_run)(PerlInterpreter*); … … 5723 5995 diff -Naur vim70.orig/src/if_python.c vim70/src/if_python.c 5724 5996 --- vim70.orig/src/if_python.c 2006-04-30 08:31:36.000000000 -0700 5725 +++ vim70/src/if_python.c 2006-1 0-25 19:55:42.000000000 -07005997 +++ vim70/src/if_python.c 2006-11-02 10:13:23.000000000 -0800 5726 5998 @@ -1463,7 +1463,7 @@ 5727 5999 if (this->buf && this->buf != INVALID_BUFFER_VALUE) … … 5762 6034 diff -Naur vim70.orig/src/if_ruby.c vim70/src/if_ruby.c 5763 6035 --- vim70.orig/src/if_ruby.c 2006-04-30 08:37:52.000000000 -0700 5764 +++ vim70/src/if_ruby.c 2006-1 0-25 19:55:31.000000000 -07006036 +++ vim70/src/if_ruby.c 2006-11-02 10:13:10.000000000 -0800 5765 6037 @@ -643,11 +643,14 @@ 5766 6038 … … 5877 6149 diff -Naur vim70.orig/src/macros.h vim70/src/macros.h 5878 6150 --- vim70.orig/src/macros.h 2006-03-01 04:01:10.000000000 -0800 5879 +++ vim70/src/macros.h 2006-1 0-25 19:55:39.000000000 -07006151 +++ vim70/src/macros.h 2006-11-02 10:13:19.000000000 -0800 5880 6152 @@ -276,3 +276,9 @@ 5881 6153 # define MB_CHARLEN(p) STRLEN(p) … … 5890 6162 diff -Naur vim70.orig/src/main.c vim70/src/main.c 5891 6163 --- vim70.orig/src/main.c 2006-05-03 10:36:44.000000000 -0700 5892 +++ vim70/src/main.c 2006-1 0-25 19:55:38.000000000 -07006164 +++ vim70/src/main.c 2006-11-02 10:13:18.000000000 -0800 5893 6165 @@ -564,7 +564,11 @@ 5894 6166 */ … … 5979 6251 diff -Naur vim70.orig/src/Makefile vim70/src/Makefile 5980 6252 --- vim70.orig/src/Makefile 2006-05-07 06:25:27.000000000 -0700 5981 +++ vim70/src/Makefile 2006-1 0-25 19:55:36.000000000 -07006253 +++ vim70/src/Makefile 2006-11-02 10:13:17.000000000 -0800 5982 6254 @@ -2177,6 +2177,7 @@ 5983 6255 cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* . … … 5999 6271 diff -Naur vim70.orig/src/mbyte.c vim70/src/mbyte.c 6000 6272 --- vim70.orig/src/mbyte.c 2006-04-30 04:51:01.000000000 -0700 6001 +++ vim70/src/mbyte.c 2006-1 0-25 19:55:34.000000000 -07006273 +++ vim70/src/mbyte.c 2006-11-02 10:13:14.000000000 -0800 6002 6274 @@ -311,7 +311,11 @@ 6003 6275 … … 6081 6353 diff -Naur vim70.orig/src/memfile.c vim70/src/memfile.c 6082 6354 --- vim70.orig/src/memfile.c 2006-03-06 00:59:15.000000000 -0800 6083 +++ vim70/src/memfile.c 2006-1 0-25 19:55:41.000000000 -07006355 +++ vim70/src/memfile.c 2006-11-02 10:13:23.000000000 -0800 6084 6356 @@ -517,7 +517,7 @@ 6085 6357 mf_ins_free(mfp, hp); /* put *hp in the free list */ … … 6114 6386 diff -Naur vim70.orig/src/memline.c vim70/src/memline.c 6115 6387 --- vim70.orig/src/memline.c 2006-04-20 14:00:21.000000000 -0700 6116 +++ vim70/src/memline.c 2006-1 0-25 19:55:45.000000000 -07006388 +++ vim70/src/memline.c 2006-11-02 10:13:25.000000000 -0800 6117 6389 @@ -215,7 +215,7 @@ 6118 6390 #define ML_FLUSH 0x02 /* flush locked block */ … … 6190 6462 diff -Naur vim70.orig/src/menu.c vim70/src/menu.c 6191 6463 --- vim70.orig/src/menu.c 2006-05-03 10:30:48.000000000 -0700 6192 +++ vim70/src/menu.c 2006-1 0-25 19:55:31.000000000 -07006464 +++ vim70/src/menu.c 2006-11-02 10:13:10.000000000 -0800 6193 6465 @@ -511,6 +511,14 @@ 6194 6466 * name (without mnemonic and accelerator text). */ … … 6267 6539 diff -Naur vim70.orig/src/message.c vim70/src/message.c 6268 6540 --- vim70.orig/src/message.c 2006-05-06 13:07:37.000000000 -0700 6269 +++ vim70/src/message.c 2006-1 0-25 19:55:45.000000000 -07006541 +++ vim70/src/message.c 2006-11-02 10:13:25.000000000 -0800 6270 6542 @@ -53,7 +53,6 @@ 6271 6543 static struct msg_hist *first_msg_hist = NULL; … … 6320 6592 diff -Naur vim70.orig/src/misc1.c vim70/src/misc1.c 6321 6593 --- vim70.orig/src/misc1.c 2006-04-30 08:30:02.000000000 -0700 6322 +++ vim70/src/misc1.c 2006-1 0-25 19:55:59.000000000 -07006594 +++ vim70/src/misc1.c 2006-11-02 10:13:29.000000000 -0800 6323 6595 @@ -1761,15 +1761,13 @@ 6324 6596 * Add column offset for 'number', 'foldcolumn', etc. … … 6435 6707 diff -Naur vim70.orig/src/misc2.c vim70/src/misc2.c 6436 6708 --- vim70.orig/src/misc2.c 2006-05-04 05:12:38.000000000 -0700 6437 +++ vim70/src/misc2.c 2006-1 0-25 19:55:42.000000000 -07006709 +++ vim70/src/misc2.c 2006-11-02 10:13:23.000000000 -0800 6438 6710 @@ -1229,6 +1229,94 @@ 6439 6711 return escaped_string; … … 6533 6805 diff -Naur vim70.orig/src/netbeans.c vim70/src/netbeans.c 6534 6806 --- vim70.orig/src/netbeans.c 2006-04-22 11:00:05.000000000 -0700 6535 +++ vim70/src/netbeans.c 2006-1 0-25 19:55:34.000000000 -07006807 +++ vim70/src/netbeans.c 2006-11-02 10:13:14.000000000 -0800 6536 6808 @@ -103,7 +103,7 @@ 6537 6809 static int inputHandler = -1; /* simply ret.value of WSAAsyncSelect() */ … … 6703 6975 diff -Naur vim70.orig/src/normal.c vim70/src/normal.c 6704 6976 --- vim70.orig/src/normal.c 2006-04-29 06:11:18.000000000 -0700 6705 +++ vim70/src/normal.c 2006-1 0-25 19:55:48.000000000 -07006977 +++ vim70/src/normal.c 2006-11-02 10:13:28.000000000 -0800 6706 6978 @@ -1477,14 +1477,17 @@ 6707 6979 } … … 6781 7053 diff -Naur vim70.orig/src/ops.c vim70/src/ops.c 6782 7054 --- vim70.orig/src/ops.c 2006-04-30 08:13:44.000000000 -0700 6783 +++ vim70/src/ops.c 2006-1 0-25 19:55:47.000000000 -07007055 +++ vim70/src/ops.c 2006-11-02 10:13:28.000000000 -0800 6784 7056 @@ -770,6 +770,7 @@ 6785 7057 { … … 6859 7131 diff -Naur vim70.orig/src/option.c vim70/src/option.c 6860 7132 --- vim70.orig/src/option.c 2006-05-03 10:32:28.000000000 -0700 6861 +++ vim70/src/option.c 2006-1 0-25 19:55:47.000000000 -07007133 +++ vim70/src/option.c 2006-11-02 10:13:28.000000000 -0800 6862 7134 @@ -2294,7 +2294,7 @@ 6863 7135 {(char_u *)0L, (char_u *)0L} … … 6975 7247 diff -Naur vim70.orig/src/os_unix.c vim70/src/os_unix.c 6976 7248 --- vim70.orig/src/os_unix.c 2006-05-01 01:13:15.000000000 -0700 6977 +++ vim70/src/os_unix.c 2006-1 0-25 19:55:34.000000000 -07007249 +++ vim70/src/os_unix.c 2006-11-02 10:13:14.000000000 -0800 6978 7250 @@ -3934,7 +3934,7 @@ 6979 7251 { … … 7034 7306 diff -Naur vim70.orig/src/popupmnu.c vim70/src/popupmnu.c 7035 7307 --- vim70.orig/src/popupmnu.c 2006-04-20 13:18:37.000000000 -0700 7036 +++ vim70/src/popupmnu.c 2006-1 0-25 19:55:32.000000000 -07007308 +++ vim70/src/popupmnu.c 2006-11-02 10:13:12.000000000 -0800 7037 7309 @@ -552,6 +552,9 @@ 7038 7310 { … … 7047 7319 diff -Naur vim70.orig/src/proto/buffer.pro vim70/src/proto/buffer.pro 7048 7320 --- vim70.orig/src/proto/buffer.pro 2006-05-07 06:08:29.000000000 -0700 7049 +++ vim70/src/proto/buffer.pro 2006-1 0-25 19:55:38.000000000 -07007321 +++ vim70/src/proto/buffer.pro 2006-11-02 10:13:18.000000000 -0800 7050 7322 @@ -10,6 +10,7 @@ 7051 7323 extern int do_buffer __ARGS((int action, int start, int dir, int count, int forceit)); … … 7058 7330 diff -Naur vim70.orig/src/proto/eval.pro vim70/src/proto/eval.pro 7059 7331 --- vim70.orig/src/proto/eval.pro 2006-05-07 06:08:33.000000000 -0700 7060 +++ vim70/src/proto/eval.pro 2006-1 0-25 19:55:46.000000000 -07007332 +++ vim70/src/proto/eval.pro 2006-11-02 10:13:27.000000000 -0800 7061 7333 @@ -44,7 +44,7 @@ 7062 7334 extern char_u *get_user_var_name __ARGS((expand_T *xp, int idx)); … … 7070 7342 diff -Naur vim70.orig/src/proto/menu.pro vim70/src/proto/menu.pro 7071 7343 --- vim70.orig/src/proto/menu.pro 2006-05-07 06:08:51.000000000 -0700 7072 +++ vim70/src/proto/menu.pro 2006-1 0-25 19:55:31.000000000 -07007344 +++ vim70/src/proto/menu.pro 2006-11-02 10:13:10.000000000 -0800 7073 7345 @@ -10,6 +10,7 @@ 7074 7346 extern int menu_is_child_of_popup __ARGS((vimmenu_T *menu)); … … 7081 7353 diff -Naur vim70.orig/src/proto/misc2.pro vim70/src/proto/misc2.pro 7082 7354 --- vim70.orig/src/proto/misc2.pro 2006-05-07 06:08:54.000000000 -0700 7083 +++ vim70/src/proto/misc2.pro 2006-1 0-25 19:55:42.000000000 -07007355 +++ vim70/src/proto/misc2.pro 2006-11-02 10:13:23.000000000 -0800 7084 7356 @@ -29,6 +29,7 @@ 7085 7357 extern char_u *vim_strnsave __ARGS((char_u *string, int len)); … … 7092 7364 diff -Naur vim70.orig/src/proto/ops.pro vim70/src/proto/ops.pro 7093 7365 --- vim70.orig/src/proto/ops.pro 2006-05-07 06:08:58.000000000 -0700 7094 +++ vim70/src/proto/ops.pro 2006-1 0-25 19:55:47.000000000 -07007366 +++ vim70/src/proto/ops.pro 2006-11-02 10:13:28.000000000 -0800 7095 7367 @@ -20,7 +20,7 @@ 7096 7368 extern int do_execreg __ARGS((int regname, int colon, int addcr)); … … 7104 7376 diff -Naur vim70.orig/src/proto/undo.pro vim70/src/proto/undo.pro 7105 7377 --- vim70.orig/src/proto/undo.pro 2006-05-07 06:09:11.000000000 -0700 7106 +++ vim70/src/proto/undo.pro 2006-1 0-25 19:55:23.000000000 -07007378 +++ vim70/src/proto/undo.pro 2006-11-02 10:13:05.000000000 -0800 7107 7379 @@ -4,6 +4,7 @@ 7108 7380 extern int u_savesub __ARGS((linenr_T lnum)); … … 7115 7387 diff -Naur vim70.orig/src/quickfix.c vim70/src/quickfix.c 7116 7388 --- vim70.orig/src/quickfix.c 2006-05-03 00:47:42.000000000 -0700 7117 +++ vim70/src/quickfix.c 2006-1 0-25 19:55:48.000000000 -07007389 +++ vim70/src/quickfix.c 2006-11-02 10:13:29.000000000 -0800 7118 7390 @@ -500,8 +500,6 @@ 7119 7391 { … … 7370 7642 diff -Naur vim70.orig/src/regexp.c vim70/src/regexp.c 7371 7643 --- vim70.orig/src/regexp.c 2006-04-30 08:31:50.000000000 -0700 7372 +++ vim70/src/regexp.c 2006-1 0-25 19:55:47.000000000 -07007644 +++ vim70/src/regexp.c 2006-11-02 10:13:28.000000000 -0800 7373 7645 @@ -3777,8 +3777,8 @@ 7374 7646 … … 7507 7779 diff -Naur vim70.orig/src/screen.c vim70/src/screen.c 7508 7780 --- vim70.orig/src/screen.c 2006-05-05 03:13:55.000000000 -0700 7509 +++ vim70/src/screen.c 2006-1 0-25 19:55:44.000000000 -07007781 +++ vim70/src/screen.c 2006-11-02 10:13:24.000000000 -0800 7510 7782 @@ -1228,7 +1228,14 @@ 7511 7783 { … … 7683 7955 diff -Naur vim70.orig/src/search.c vim70/src/search.c 7684 7956 --- vim70.orig/src/search.c 2006-05-05 05:12:13.000000000 -0700 7685 +++ vim70/src/search.c 2006-1 0-25 19:55:45.000000000 -07007957 +++ vim70/src/search.c 2006-11-02 10:13:25.000000000 -0800 7686 7958 @@ -1259,7 +1259,7 @@ 7687 7959 /* … … 7740 8012 diff -Naur vim70.orig/src/spell.c vim70/src/spell.c 7741 8013 --- vim70.orig/src/spell.c 2006-05-05 00:49:58.000000000 -0700 7742 +++ vim70/src/spell.c 2006-1 0-25 19:55:41.000000000 -07008014 +++ vim70/src/spell.c 2006-11-02 10:13:22.000000000 -0800 7743 8015 @@ -1483,7 +1483,7 @@ 7744 8016 else if ((mode == FIND_COMPOUND || mode == FIND_KEEPCOMPOUND … … 8071 8343 diff -Naur vim70.orig/src/structs.h vim70/src/structs.h 8072 8344 --- vim70.orig/src/structs.h 2006-04-09 10:57:46.000000000 -0700 8073 +++ vim70/src/structs.h 2006-1 0-25 19:55:31.000000000 -07008345 +++ vim70/src/structs.h 2006-11-02 10:13:10.000000000 -0800 8074 8346 @@ -2213,18 +2213,20 @@ 8075 8347 … … 8097 8369 diff -Naur vim70.orig/src/syntax.c vim70/src/syntax.c 8098 8370 --- vim70.orig/src/syntax.c 2006-04-26 05:49:45.000000000 -0700 8099 +++ vim70/src/syntax.c 2006-1 0-25 19:55:44.000000000 -07008371 +++ vim70/src/syntax.c 2006-11-02 10:13:33.000000000 -0800 8100 8372 @@ -977,6 +977,7 @@ 8101 8373 { … … 8187 8459 } 8188 8460 8461 @@ -6054,7 +6072,11 @@ 8462 ++level; 8463 } 8464 if (level > wp->w_p_fdn) 8465 + { 8466 level = wp->w_p_fdn; 8467 + if (level < 0) 8468 + level = 0; 8469 + } 8470 return level; 8471 } 8472 #endif 8189 8473 diff -Naur vim70.orig/src/tag.c vim70/src/tag.c 8190 8474 --- vim70.orig/src/tag.c 2006-04-27 06:11:21.000000000 -0700 8191 +++ vim70/src/tag.c 2006-1 0-25 19:55:46.000000000 -07008475 +++ vim70/src/tag.c 2006-11-02 10:13:27.000000000 -0800 8192 8476 @@ -911,7 +911,7 @@ 8193 8477 … … 8231 8515 diff -Naur vim70.orig/src/term.c vim70/src/term.c 8232 8516 --- vim70.orig/src/term.c 2006-05-03 10:34:57.000000000 -0700 8233 +++ vim70/src/term.c 2006-1 0-25 19:56:02.000000000 -07008517 +++ vim70/src/term.c 2006-11-02 10:13:29.000000000 -0800 8234 8518 @@ -3137,25 +3137,32 @@ 8235 8519 screenalloc(FALSE); … … 8295 8579 diff -Naur vim70.orig/src/testdir/test56.in vim70/src/testdir/test56.in 8296 8580 --- vim70.orig/src/testdir/test56.in 2005-05-18 08:37:37.000000000 -0700 8297 +++ vim70/src/testdir/test56.in 2006-1 0-25 19:55:38.000000000 -07008581 +++ vim70/src/testdir/test56.in 2006-11-02 10:13:18.000000000 -0800 8298 8582 @@ -3,7 +3,7 @@ 8299 8583 STARTTEST … … 8307 8591 diff -Naur vim70.orig/src/ui.c vim70/src/ui.c 8308 8592 --- vim70.orig/src/ui.c 2006-03-27 11:15:09.000000000 -0800 8309 +++ vim70/src/ui.c 2006-1 0-25 19:55:35.000000000 -07008593 +++ vim70/src/ui.c 2006-11-02 10:13:14.000000000 -0800 8310 8594 @@ -1137,7 +1137,6 @@ 8311 8595 int len; … … 8327 8611 diff -Naur vim70.orig/src/undo.c vim70/src/undo.c 8328 8612 --- vim70.orig/src/undo.c 2006-04-21 02:30:59.000000000 -0700 8329 +++ vim70/src/undo.c 2006-1 0-25 19:55:35.000000000 -07008613 +++ vim70/src/undo.c 2006-11-02 10:13:14.000000000 -0800 8330 8614 @@ -84,7 +84,6 @@ 8331 8615 static void u_unch_branch __ARGS((u_header_T *uhp)); … … 8392 8676 diff -Naur vim70.orig/src/version.c vim70/src/version.c 8393 8677 --- vim70.orig/src/version.c 2006-05-03 00:50:42.000000000 -0700 8394 +++ vim70/src/version.c 2006-1 0-25 19:56:09.000000000 -07008395 @@ -667,6 +667,2 84 @@8678 +++ vim70/src/version.c 2006-11-02 10:13:49.000000000 -0800 8679 @@ -667,6 +667,294 @@ 8396 8680 static int included_patches[] = 8397 8681 { /* Add new patch number below this line */ 8398 8682 /**/ 8683 + 158, 8684 +/**/ 8685 + 157, 8686 +/**/ 8687 + 155, 8688 +/**/ 8689 + 154, 8690 +/**/ 8691 + 153, 8692 +/**/ 8399 8693 + 152, 8400 8694 +/**/ … … 8678 8972 }; 8679 8973 8680 @@ -731,7 +10 09,11 @@8974 @@ -731,7 +1019,11 @@ 8681 8975 /* Only MS VC 4.1 and earlier can do Win32s */ 8682 8976 MSG_PUTS(_("\nMS-Windows 16/32 bit GUI version")); … … 8692 8986 diff -Naur vim70.orig/src/vim.h vim70/src/vim.h 8693 8987 --- vim70.orig/src/vim.h 2006-04-30 08:32:38.000000000 -0700 8694 +++ vim70/src/vim.h 2006-1 0-25 19:55:35.000000000 -07008988 +++ vim70/src/vim.h 2006-11-02 10:13:37.000000000 -0800 8695 8989 @@ -585,7 +585,6 @@ 8696 8990 #define INSERT 0x10 /* Insert mode */ … … 8719 9013 EVENT_INSERTENTER, /* when entering Insert mode */ 8720 9014 EVENT_INSERTLEAVE, /* when leaving Insert mode */ 9015 @@ -1666,7 +1669,10 @@ 9016 #define VV_SWAPCHOICE 46 9017 #define VV_SWAPCOMMAND 47 9018 #define VV_CHAR 48 9019 -#define VV_LEN 49 /* number of v: vars */ 9020 +#define VV_MOUSE_WIN 49 9021 +#define VV_MOUSE_LNUM 50 9022 +#define VV_MOUSE_COL 51 9023 +#define VV_LEN 52 /* number of v: vars */ 9024 9025 #ifdef FEAT_CLIPBOARD 9026 8721 9027 diff -Naur vim70.orig/src/window.c vim70/src/window.c 8722 9028 --- vim70.orig/src/window.c 2006-05-06 03:54:51.000000000 -0700 8723 +++ vim70/src/window.c 2006-1 0-25 19:55:59.000000000 -07009029 +++ vim70/src/window.c 2006-11-02 10:13:29.000000000 -0800 8724 9030 @@ -340,10 +340,10 @@ 8725 9031 { … … 8845 9151 hasFoldingWin(wp, lnum, &lnum, NULL, TRUE, NULL); 8846 9152 if (lnum == 1) 8847
Note:
See TracChangeset
for help on using the changeset viewer.