- Timestamp:
- Mar 1, 2009, 7:15:14 PM (16 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 7d2671a
- Parents:
- 4a3510d
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
patches/vim-7.2-branch_update-10.patch
r4a3510d r4635005 1 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 0 2-22-20092 Date: 03-01-2009 3 3 Initial Package Version: 7.2 4 4 Origin: Upstream 5 5 Upstream Status: Applied 6 Description: Contains all upstream patches up to 7.2.12 46 Description: Contains all upstream patches up to 7.2.128 7 7 The following patches were skipped 8 8 007 036 041 049 071 072 074 088 089 093 101 … … 10 10 diff -Naur vim72.orig/Filelist vim72/Filelist 11 11 --- vim72.orig/Filelist 2008-07-06 11:02:23.000000000 -0700 12 +++ vim72/Filelist 2009-0 2-22 21:57:28.764584997-080012 +++ vim72/Filelist 2009-03-01 11:06:57.584431903 -0800 13 13 @@ -285,6 +285,7 @@ 14 14 src/proto/os_win32.pro \ … … 21 21 diff -Naur vim72.orig/runtime/doc/cmdline.txt vim72/runtime/doc/cmdline.txt 22 22 --- vim72.orig/runtime/doc/cmdline.txt 2008-08-09 07:22:59.000000000 -0700 23 +++ vim72/runtime/doc/cmdline.txt 2009-0 2-22 21:57:28.892594217-080023 +++ vim72/runtime/doc/cmdline.txt 2009-03-01 11:07:42.747327559 -0800 24 24 @@ -1,4 +1,4 @@ 25 25 -*cmdline.txt* For Vim version 7.2. Last change: 2008 Jul 29 … … 80 80 diff -Naur vim72.orig/runtime/doc/eval.txt vim72/runtime/doc/eval.txt 81 81 --- vim72.orig/runtime/doc/eval.txt 2008-08-09 07:22:59.000000000 -0700 82 +++ vim72/runtime/doc/eval.txt 2009-0 2-22 21:57:40.793357172-080082 +++ vim72/runtime/doc/eval.txt 2009-03-01 11:10:05.720489174 -0800 83 83 @@ -1,4 +1,4 @@ 84 84 -*eval.txt* For Vim version 7.2. Last change: 2008 Aug 09 … … 200 200 diff -Naur vim72.orig/runtime/doc/netbeans.txt vim72/runtime/doc/netbeans.txt 201 201 --- vim72.orig/runtime/doc/netbeans.txt 2008-08-09 07:22:59.000000000 -0700 202 +++ vim72/runtime/doc/netbeans.txt 2009-0 2-22 21:57:51.694055594-0800202 +++ vim72/runtime/doc/netbeans.txt 2009-03-01 11:10:39.066624388 -0800 203 203 @@ -1,4 +1,4 @@ 204 204 -*netbeans.txt* For Vim version 7.2. Last change: 2008 Jun 28 … … 222 222 diff -Naur vim72.orig/runtime/doc/options.txt vim72/runtime/doc/options.txt 223 223 --- vim72.orig/runtime/doc/options.txt 2008-08-09 07:22:59.000000000 -0700 224 +++ vim72/runtime/doc/options.txt 2009-0 2-22 21:58:02.958777762-0800224 +++ vim72/runtime/doc/options.txt 2009-03-01 11:11:54.531461377 -0800 225 225 @@ -1,4 +1,4 @@ 226 226 -*options.txt* For Vim version 7.2. Last change: 2008 Aug 06 … … 253 253 diff -Naur vim72.orig/runtime/doc/spell.txt vim72/runtime/doc/spell.txt 254 254 --- vim72.orig/runtime/doc/spell.txt 2008-08-09 07:23:00.000000000 -0700 255 +++ vim72/runtime/doc/spell.txt 2009-0 2-22 21:57:40.717352144-0800255 +++ vim72/runtime/doc/spell.txt 2009-03-01 11:09:50.439508031 -0800 256 256 @@ -1,4 +1,4 @@ 257 257 -*spell.txt* For Vim version 7.2. Last change: 2008 Jun 21 … … 383 383 diff -Naur vim72.orig/runtime/doc/starting.txt vim72/runtime/doc/starting.txt 384 384 --- vim72.orig/runtime/doc/starting.txt 2008-08-09 07:23:00.000000000 -0700 385 +++ vim72/runtime/doc/starting.txt 2009-0 2-22 21:57:28.896592820-0800385 +++ vim72/runtime/doc/starting.txt 2009-03-01 11:07:42.747327559 -0800 386 386 @@ -1,4 +1,4 @@ 387 387 -*starting.txt* For Vim version 7.2. Last change: 2008 Jun 21 … … 445 445 diff -Naur vim72.orig/runtime/doc/usr_21.txt vim72/runtime/doc/usr_21.txt 446 446 --- vim72.orig/runtime/doc/usr_21.txt 2008-08-09 07:23:01.000000000 -0700 447 +++ vim72/runtime/doc/usr_21.txt 2009-0 2-22 21:57:28.896592820-0800447 +++ vim72/runtime/doc/usr_21.txt 2009-03-01 11:07:42.751325883 -0800 448 448 @@ -1,4 +1,4 @@ 449 449 -*usr_21.txt* For Vim version 7.2. Last change: 2007 May 01 … … 512 512 diff -Naur vim72.orig/runtime/scripts.vim vim72/runtime/scripts.vim 513 513 --- vim72.orig/runtime/scripts.vim 2008-08-08 15:27:21.000000000 -0700 514 +++ vim72/runtime/scripts.vim 2009-0 2-22 21:57:25.668388043-0800514 +++ vim72/runtime/scripts.vim 2009-03-01 11:05:28.166702332 -0800 515 515 @@ -234,6 +234,10 @@ 516 516 elseif s:line1 =~ '\<DTD\s\+XHTML\s' … … 526 526 diff -Naur vim72.orig/src/auto/configure vim72/src/auto/configure 527 527 --- vim72.orig/src/auto/configure 2008-07-24 05:40:36.000000000 -0700 528 +++ vim72/src/auto/configure 2009-0 2-22 21:57:36.313067746-0800528 +++ vim72/src/auto/configure 2009-03-01 11:08:15.605433440 -0800 529 529 @@ -16819,21 +16819,29 @@ 530 530 LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" … … 567 567 diff -Naur vim72.orig/src/buffer.c vim72/src/buffer.c 568 568 --- vim72.orig/src/buffer.c 2008-08-06 04:00:48.000000000 -0700 569 +++ vim72/src/buffer.c 2009-0 2-22 21:58:03.050783349-0800569 +++ vim72/src/buffer.c 2009-03-01 11:12:14.420733621 -0800 570 570 @@ -437,10 +437,6 @@ 571 571 return; … … 695 695 diff -Naur vim72.orig/src/configure.in vim72/src/configure.in 696 696 --- vim72.orig/src/configure.in 2008-07-24 05:40:26.000000000 -0700 697 +++ vim72/src/configure.in 2009-0 2-22 21:57:36.313067746-0800697 +++ vim72/src/configure.in 2009-03-01 11:08:15.605433440 -0800 698 698 @@ -3152,18 +3152,25 @@ 699 699 dnl But only when making dependencies, cproto and lint don't take "-isystem". … … 730 730 diff -Naur vim72.orig/src/diff.c vim72/src/diff.c 731 731 --- vim72.orig/src/diff.c 2008-03-05 03:16:56.000000000 -0800 732 +++ vim72/src/diff.c 2009-0 2-22 21:57:51.762059784 -0800732 +++ vim72/src/diff.c 2009-03-01 11:10:56.831763654 -0800 733 733 @@ -8,7 +8,7 @@ 734 734 */ … … 856 856 diff -Naur vim72.orig/src/edit.c vim72/src/edit.c 857 857 --- vim72.orig/src/edit.c 2008-08-06 05:51:17.000000000 -0700 858 +++ vim72/src/edit.c 2009-0 2-22 21:58:02.962778041-0800858 +++ vim72/src/edit.c 2009-03-01 11:11:54.531461377 -0800 859 859 @@ -147,6 +147,7 @@ 860 860 static int ins_compl_bs __ARGS((void)); … … 1116 1116 diff -Naur vim72.orig/src/eval.c vim72/src/eval.c 1117 1117 --- vim72.orig/src/eval.c 2008-08-07 12:37:22.000000000 -0700 1118 +++ vim72/src/eval.c 2009-0 2-22 21:58:00.290604274-08001118 +++ vim72/src/eval.c 2009-03-01 11:11:26.821685989 -0800 1119 1119 @@ -32,6 +32,9 @@ 1120 1120 … … 2005 2005 diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c 2006 2006 --- vim72.orig/src/ex_cmds2.c 2008-07-13 09:18:22.000000000 -0700 2007 +++ vim72/src/ex_cmds2.c 2009-0 2-22 21:58:02.862770777-08002007 +++ vim72/src/ex_cmds2.c 2009-03-01 11:11:36.726320435 -0800 2008 2008 @@ -2842,6 +2842,7 @@ 2009 2009 linenr_T save_sourcing_lnum; … … 2098 2098 diff -Naur vim72.orig/src/ex_cmds.c vim72/src/ex_cmds.c 2099 2099 --- vim72.orig/src/ex_cmds.c 2008-08-04 12:15:00.000000000 -0700 2100 +++ vim72/src/ex_cmds.c 2009-0 2-22 21:58:02.886772733 -08002100 +++ vim72/src/ex_cmds.c 2009-03-01 11:12:37.162193043 -0800 2101 2101 @@ -24,7 +24,7 @@ 2102 2102 static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out)); … … 2276 2276 sub_firstline = NULL; 2277 2277 } 2278 @@ -6520,6 +6529,7 @@ 2279 static int last_sign_typenr = MAX_TYPENR; /* is decremented */ 2280 2281 static void sign_list_defined __ARGS((sign_T *sp)); 2282 +static void sign_undefine __ARGS((sign_T *sp, sign_T *sp_prev)); 2283 2284 /* 2285 * ":sign" command 2286 @@ -6728,24 +6738,8 @@ 2287 /* ":sign list {name}" */ 2288 sign_list_defined(sp); 2289 else 2290 - { 2291 /* ":sign undefine {name}" */ 2292 - vim_free(sp->sn_name); 2293 - vim_free(sp->sn_icon); 2294 -#ifdef FEAT_SIGN_ICONS 2295 - if (sp->sn_image != NULL) 2296 - { 2297 - out_flush(); 2298 - gui_mch_destroy_sign(sp->sn_image); 2299 - } 2300 -#endif 2301 - vim_free(sp->sn_text); 2302 - if (sp_prev == NULL) 2303 - first_sign = sp->sn_next; 2304 - else 2305 - sp_prev->sn_next = sp->sn_next; 2306 - vim_free(sp); 2307 - } 2308 + sign_undefine(sp, sp_prev); 2309 } 2310 } 2311 else 2312 @@ -6994,6 +6988,31 @@ 2313 } 2314 2315 /* 2316 + * Undefine a sign and free its memory. 2317 + */ 2318 + static void 2319 +sign_undefine(sp, sp_prev) 2320 + sign_T *sp; 2321 + sign_T *sp_prev; 2322 +{ 2323 + vim_free(sp->sn_name); 2324 + vim_free(sp->sn_icon); 2325 +#ifdef FEAT_SIGN_ICONS 2326 + if (sp->sn_image != NULL) 2327 + { 2328 + out_flush(); 2329 + gui_mch_destroy_sign(sp->sn_image); 2330 + } 2331 +#endif 2332 + vim_free(sp->sn_text); 2333 + if (sp_prev == NULL) 2334 + first_sign = sp->sn_next; 2335 + else 2336 + sp_prev->sn_next = sp->sn_next; 2337 + vim_free(sp); 2338 +} 2339 + 2340 +/* 2341 * Get highlighting attribute for sign "typenr". 2342 * If "line" is TRUE: line highl, if FALSE: text highl. 2343 */ 2344 @@ -7067,6 +7086,18 @@ 2345 return (char_u *)_("[Deleted]"); 2346 } 2347 2348 +#if defined(EXITFREE) || defined(PROTO) 2349 +/* 2350 + * Undefine/free all signs. 2351 + */ 2352 + void 2353 +free_signs() 2354 +{ 2355 + while (first_sign != NULL) 2356 + sign_undefine(first_sign, NULL); 2357 +} 2358 +#endif 2359 + 2360 #endif 2361 2362 #if defined(FEAT_GUI) || defined(FEAT_CLIENTSERVER) || defined(PROTO) 2278 2363 diff -Naur vim72.orig/src/ex_cmds.h vim72/src/ex_cmds.h 2279 2364 --- vim72.orig/src/ex_cmds.h 2008-06-21 11:47:57.000000000 -0700 2280 +++ vim72/src/ex_cmds.h 2009-0 2-22 21:57:28.904593099-08002365 +++ vim72/src/ex_cmds.h 2009-03-01 11:07:42.759326442 -0800 2281 2366 @@ -278,7 +278,7 @@ 2282 2367 EX(CMD_crewind, "crewind", ex_cc, … … 2326 2411 diff -Naur vim72.orig/src/ex_docmd.c vim72/src/ex_docmd.c 2327 2412 --- vim72.orig/src/ex_docmd.c 2008-07-26 04:51:05.000000000 -0700 2328 +++ vim72/src/ex_docmd.c 2009-0 2-22 21:58:02.982779158-08002413 +++ vim72/src/ex_docmd.c 2009-03-01 11:12:42.138510127 -0800 2329 2414 @@ -364,6 +364,7 @@ 2330 2415 # define ex_function ex_ni … … 2442 2527 - (void)mch_chdir((char *)globaldir); 2443 2528 - shorten_fnames(TRUE); 2444 + if (mch_chdir((char *)globaldir) == OK)2529 + if (mch_chdir((char *)globaldir) == 0) 2445 2530 + shorten_fnames(TRUE); 2446 2531 } … … 2545 2630 diff -Naur vim72.orig/src/ex_getln.c vim72/src/ex_getln.c 2546 2631 --- vim72.orig/src/ex_getln.c 2008-08-08 02:31:33.000000000 -0700 2547 +++ vim72/src/ex_getln.c 2009-0 2-22 21:57:40.525339851-08002632 +++ vim72/src/ex_getln.c 2009-03-01 11:08:34.930671043 -0800 2548 2633 @@ -31,6 +31,8 @@ 2549 2634 int cmdattr; /* attributes for prompt */ … … 2679 2764 diff -Naur vim72.orig/src/feature.h vim72/src/feature.h 2680 2765 --- vim72.orig/src/feature.h 2008-08-06 04:00:39.000000000 -0700 2681 +++ vim72/src/feature.h 2009-0 2-22 21:57:28.908593378-08002766 +++ vim72/src/feature.h 2009-03-01 11:07:42.763326442 -0800 2682 2767 @@ -767,9 +767,13 @@ 2683 2768 … … 2698 2783 diff -Naur vim72.orig/src/fileio.c vim72/src/fileio.c 2699 2784 --- vim72.orig/src/fileio.c 2008-08-06 04:01:03.000000000 -0700 2700 +++ vim72/src/fileio.c 2009-0 2-22 21:57:51.674054756-08002785 +++ vim72/src/fileio.c 2009-03-01 11:10:34.002299762 -0800 2701 2786 @@ -932,7 +932,10 @@ 2702 2787 else … … 2928 3013 diff -Naur vim72.orig/src/fold.c vim72/src/fold.c 2929 3014 --- vim72.orig/src/fold.c 2008-08-06 04:01:12.000000000 -0700 2930 +++ vim72/src/fold.c 2009-0 2-22 21:57:51.682054476-08003015 +++ vim72/src/fold.c 2009-03-01 11:10:36.446457605 -0800 2931 3016 @@ -48,7 +48,7 @@ 2932 3017 static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp)); … … 3017 3102 diff -Naur vim72.orig/src/getchar.c vim72/src/getchar.c 3018 3103 --- vim72.orig/src/getchar.c 2008-07-22 09:57:48.000000000 -0700 3019 +++ vim72/src/getchar.c 2009-0 2-22 21:58:03.122787819-08003104 +++ vim72/src/getchar.c 2009-03-01 11:12:29.677711691 -0800 3020 3105 @@ -3816,7 +3816,11 @@ 3021 3106 int len = 1; … … 3050 3135 diff -Naur vim72.orig/src/globals.h vim72/src/globals.h 3051 3136 --- vim72.orig/src/globals.h 2008-07-26 04:53:29.000000000 -0700 3052 +++ vim72/src/globals.h 2009-0 2-22 21:57:51.694055594-08003137 +++ vim72/src/globals.h 2009-03-01 11:10:39.066624388 -0800 3053 3138 @@ -1022,6 +1022,7 @@ 3054 3139 #endif … … 3084 3169 diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c 3085 3170 --- vim72.orig/src/gui_at_sb.c 2004-06-07 07:32:25.000000000 -0700 3086 +++ vim72/src/gui_at_sb.c 2009-0 2-22 21:57:40.637347115-08003171 +++ vim72/src/gui_at_sb.c 2009-03-01 11:08:45.631356893 -0800 3087 3172 @@ -1078,6 +1078,12 @@ 3088 3173 Cardinal *num_params; /* unused */ … … 3110 3195 diff -Naur vim72.orig/src/gui.c vim72/src/gui.c 3111 3196 --- vim72.orig/src/gui.c 2008-07-27 12:32:14.000000000 -0700 3112 +++ vim72/src/gui.c 2009-0 2-22 21:57:40.773355217-08003197 +++ vim72/src/gui.c 2009-03-01 11:10:03.076318759 -0800 3113 3198 @@ -139,7 +139,7 @@ 3114 3199 /* The read returns when the child closes the pipe (or when … … 3203 3288 diff -Naur vim72.orig/src/gui_gtk_x11.c vim72/src/gui_gtk_x11.c 3204 3289 --- vim72.orig/src/gui_gtk_x11.c 2008-07-04 03:46:24.000000000 -0700 3205 +++ vim72/src/gui_gtk_x11.c 2009-0 2-22 21:57:40.637347115-08003290 +++ vim72/src/gui_gtk_x11.c 2009-03-01 11:08:45.631356893 -0800 3206 3291 @@ -4070,14 +4070,14 @@ 3207 3292 … … 3227 3312 diff -Naur vim72.orig/src/gui_x11.c vim72/src/gui_x11.c 3228 3313 --- vim72.orig/src/gui_x11.c 2008-06-08 08:13:45.000000000 -0700 3229 +++ vim72/src/gui_x11.c 2009-02-22 21:57:28.972599804 -0800 3230 @@ -2450,7 +2450,7 @@ 3314 +++ vim72/src/gui_x11.c 2009-03-01 11:12:34.666031009 -0800 3315 @@ -1587,6 +1587,8 @@ 3316 XtCloseDisplay(gui.dpy); 3317 gui.dpy = NULL; 3318 vimShell = (Widget)0; 3319 + vim_free(gui_argv); 3320 + gui_argv = NULL; 3321 } 3322 3323 /* 3324 @@ -1761,6 +1763,8 @@ 3325 * says that this isn't needed when exiting, so just skip it. */ 3326 XtCloseDisplay(gui.dpy); 3327 #endif 3328 + vim_free(gui_argv); 3329 + gui_argv = NULL; 3330 } 3331 3332 /* 3333 @@ -2450,7 +2454,7 @@ 3231 3334 *colorPtr = colortable[closest]; 3232 3335 } … … 3237 3340 } 3238 3341 3342 @@ -3439,47 +3443,37 @@ 3343 char_u *signfile; 3344 { 3345 XpmAttributes attrs; 3346 - XImage *sign; 3347 + XImage *sign = NULL; 3348 int status; 3349 3350 /* 3351 * Setup the color substitution table. 3352 */ 3353 - sign = NULL; 3354 if (signfile[0] != NUL && signfile[0] != '-') 3355 { 3356 - sign = (XImage *)alloc(sizeof(XImage)); 3357 - if (sign != NULL) 3358 + XpmColorSymbol color[5] = 3359 { 3360 - XpmColorSymbol color[5] = 3361 - { 3362 - {"none", NULL, 0}, 3363 - {"iconColor1", NULL, 0}, 3364 - {"bottomShadowColor", NULL, 0}, 3365 - {"topShadowColor", NULL, 0}, 3366 - {"selectColor", NULL, 0} 3367 - }; 3368 - attrs.valuemask = XpmColorSymbols; 3369 - attrs.numsymbols = 2; 3370 - attrs.colorsymbols = color; 3371 - attrs.colorsymbols[0].pixel = gui.back_pixel; 3372 - attrs.colorsymbols[1].pixel = gui.norm_pixel; 3373 - status = XpmReadFileToImage(gui.dpy, (char *)signfile, 3374 + {"none", NULL, 0}, 3375 + {"iconColor1", NULL, 0}, 3376 + {"bottomShadowColor", NULL, 0}, 3377 + {"topShadowColor", NULL, 0}, 3378 + {"selectColor", NULL, 0} 3379 + }; 3380 + attrs.valuemask = XpmColorSymbols; 3381 + attrs.numsymbols = 2; 3382 + attrs.colorsymbols = color; 3383 + attrs.colorsymbols[0].pixel = gui.back_pixel; 3384 + attrs.colorsymbols[1].pixel = gui.norm_pixel; 3385 + status = XpmReadFileToImage(gui.dpy, (char *)signfile, 3386 &sign, NULL, &attrs); 3387 - 3388 - if (status == 0) 3389 - { 3390 - /* Sign width is fixed at two columns now. 3391 - if (sign->width > gui.sign_width) 3392 - gui.sign_width = sign->width + 8; */ 3393 - } 3394 - else 3395 - { 3396 - vim_free(sign); 3397 - sign = NULL; 3398 - EMSG(_(e_signdata)); 3399 - } 3400 + if (status == 0) 3401 + { 3402 + /* Sign width is fixed at two columns now. 3403 + if (sign->width > gui.sign_width) 3404 + gui.sign_width = sign->width + 8; */ 3405 } 3406 + else 3407 + EMSG(_(e_signdata)); 3408 } 3409 3410 return (void *)sign; 3411 @@ -3489,8 +3483,7 @@ 3412 gui_mch_destroy_sign(sign) 3413 void *sign; 3414 { 3415 - XFree(((XImage *)sign)->data); 3416 - vim_free(sign); 3417 + XDestroyImage((XImage*)sign); 3418 } 3419 #endif 3420 3239 3421 diff -Naur vim72.orig/src/gui_xmdlg.c vim72/src/gui_xmdlg.c 3240 3422 --- vim72.orig/src/gui_xmdlg.c 2008-06-21 09:05:32.000000000 -0700 3241 +++ vim72/src/gui_xmdlg.c 2009-0 2-22 21:57:40.637347115-08003423 +++ vim72/src/gui_xmdlg.c 2009-03-01 11:08:45.635357731 -0800 3242 3424 @@ -369,10 +369,10 @@ 3243 3425 char buf[TEMP_BUF_SIZE]; … … 3395 3577 diff -Naur vim72.orig/src/gui_xmebw.c vim72/src/gui_xmebw.c 3396 3578 --- vim72.orig/src/gui_xmebw.c 2007-09-06 03:57:51.000000000 -0700 3397 +++ vim72/src/gui_xmebw.c 2009-0 2-22 21:57:40.637347115-08003579 +++ vim72/src/gui_xmebw.c 2009-03-01 11:08:45.635357731 -0800 3398 3580 @@ -1256,7 +1256,7 @@ 3399 3581 } … … 3422 3604 diff -Naur vim72.orig/src/if_cscope.c vim72/src/if_cscope.c 3423 3605 --- vim72.orig/src/if_cscope.c 2008-06-24 09:32:34.000000000 -0700 3424 +++ vim72/src/if_cscope.c 2009-0 2-22 21:57:57.086400893-08003606 +++ vim72/src/if_cscope.c 2009-03-01 11:11:09.312562089 -0800 3425 3607 @@ -74,7 +74,7 @@ 3426 3608 { "add", cs_add, … … 3465 3647 diff -Naur vim72.orig/src/if_cscope.h vim72/src/if_cscope.h 3466 3648 --- vim72.orig/src/if_cscope.h 2007-09-02 07:51:08.000000000 -0700 3467 +++ vim72/src/if_cscope.h 2009-0 2-22 21:57:25.644386646-08003649 +++ vim72/src/if_cscope.h 2009-03-01 11:05:23.086376868 -0800 3468 3650 @@ -42,17 +42,6 @@ 3469 3651 * f 7name Find this file … … 3486 3668 diff -Naur vim72.orig/src/if_perl.xs vim72/src/if_perl.xs 3487 3669 --- vim72.orig/src/if_perl.xs 2008-07-17 13:55:09.000000000 -0700 3488 +++ vim72/src/if_perl.xs 2009-0 2-22 21:57:40.757353820 -08003670 +++ vim72/src/if_perl.xs 2009-03-01 11:09:57.879986590 -0800 3489 3671 @@ -136,6 +136,9 @@ 3490 3672 # define Perl_newXS_flags dll_Perl_newXS_flags … … 3537 3719 diff -Naur vim72.orig/src/if_python.c vim72/src/if_python.c 3538 3720 --- vim72.orig/src/if_python.c 2008-07-17 14:09:32.000000000 -0700 3539 +++ vim72/src/if_python.c 2009-0 2-22 21:57:51.746058667-08003721 +++ vim72/src/if_python.c 2009-03-01 11:10:51.831442100 -0800 3540 3722 @@ -531,6 +531,12 @@ 3541 3723 if (PythonMod_Init()) … … 3639 3821 diff -Naur vim72.orig/src/if_xcmdsrv.c vim72/src/if_xcmdsrv.c 3640 3822 --- vim72.orig/src/if_xcmdsrv.c 2008-07-18 06:05:03.000000000 -0700 3641 +++ vim72/src/if_xcmdsrv.c 2009-0 2-22 21:57:32.260810448-08003823 +++ vim72/src/if_xcmdsrv.c 2009-03-01 11:08:00.312452856 -0800 3642 3824 @@ -736,7 +736,7 @@ 3643 3825 + serverReply.ga_len; … … 3669 3851 diff -Naur vim72.orig/src/macros.h vim72/src/macros.h 3670 3852 --- vim72.orig/src/macros.h 2007-08-04 04:44:18.000000000 -0700 3671 +++ vim72/src/macros.h 2009-0 2-22 21:58:02.962778041-08003853 +++ vim72/src/macros.h 2009-03-01 11:11:54.531461377 -0800 3672 3854 @@ -127,15 +127,31 @@ 3673 3855 #ifdef FEAT_LANGMAP … … 3709 3891 diff -Naur vim72.orig/src/main.c vim72/src/main.c 3710 3892 --- vim72.orig/src/main.c 2008-07-24 01:40:56.000000000 -0700 3711 +++ vim72/src/main.c 2009-0 2-22 21:57:40.641347674-08003893 +++ vim72/src/main.c 2009-03-01 11:08:45.635357731 -0800 3712 3894 @@ -645,11 +645,12 @@ 3713 3895 … … 3771 3953 diff -Naur vim72.orig/src/mark.c vim72/src/mark.c 3772 3954 --- vim72.orig/src/mark.c 2008-08-08 15:06:49.000000000 -0700 3773 +++ vim72/src/mark.c 2009-0 2-22 21:57:28.912593658-08003955 +++ vim72/src/mark.c 2009-03-01 11:07:42.767327000 -0800 3774 3956 @@ -1627,15 +1627,17 @@ 3775 3957 … … 3840 4022 diff -Naur vim72.orig/src/mbyte.c vim72/src/mbyte.c 3841 4023 --- vim72.orig/src/mbyte.c 2008-07-14 05:38:05.000000000 -0700 3842 +++ vim72/src/mbyte.c 2009-0 2-22 21:57:40.641347674-08004024 +++ vim72/src/mbyte.c 2009-03-01 11:08:45.635357731 -0800 3843 4025 @@ -717,7 +717,7 @@ 3844 4026 * where mblen() returns 0 for invalid character. … … 3922 4104 diff -Naur vim72.orig/src/menu.c vim72/src/menu.c 3923 4105 --- vim72.orig/src/menu.c 2008-06-21 12:53:43.000000000 -0700 3924 +++ vim72/src/menu.c 2009-0 2-22 21:57:25.620383014-08004106 +++ vim72/src/menu.c 2009-03-01 11:05:17.942048889 -0800 3925 4107 @@ -1120,6 +1120,7 @@ 3926 4108 parent = menu; … … 3933 4115 diff -Naur vim72.orig/src/message.c vim72/src/message.c 3934 4116 --- vim72.orig/src/message.c 2008-07-09 11:24:55.000000000 -0700 3935 +++ vim72/src/message.c 2009-0 2-22 21:58:03.062784187-08004117 +++ vim72/src/message.c 2009-03-01 11:12:39.674353959 -0800 3936 4118 @@ -976,7 +976,7 @@ 3937 4119 } … … 3964 4146 case K_LEFTMOUSE: 3965 4147 scroll = Rows - 1; 3966 @@ -3309,7 +3310,10 @@ 4148 @@ -2552,7 +2553,6 @@ 4149 { 4150 /* Jump to the choices of the dialog. */ 4151 retval = TRUE; 4152 - lines_left = Rows - 1; 4153 } 4154 else 4155 #endif 4156 @@ -2560,6 +2560,9 @@ 4157 got_int = TRUE; 4158 quit_more = TRUE; 4159 } 4160 + /* When there is some more output (wrapping line) display that 4161 + * without another prompt. */ 4162 + lines_left = Rows - 1; 4163 break; 4164 4165 #ifdef FEAT_CLIPBOARD 4166 @@ -3309,7 +3312,10 @@ 3967 4167 { 3968 4168 c = gui_mch_dialog(type, title, message, buttons, dfltbutton, … … 3976 4176 /* Flush output to avoid that further messages and redrawing is done 3977 4177 * in the wrong order. */ 3978 @@ -4556,7 +456 0,13 @@4178 @@ -4556,7 +4562,13 @@ 3979 4179 remove_trailing_zeroes = TRUE; 3980 4180 } … … 3991 4191 /* Avoid a buffer overflow */ 3992 4192 strcpy(tmp, "inf"); 3993 @@ -4585,61 +459 5,62 @@4193 @@ -4585,61 +4597,62 @@ 3994 4194 if (remove_trailing_zeroes) 3995 4195 { … … 4077 4277 diff -Naur vim72.orig/src/misc1.c vim72/src/misc1.c 4078 4278 --- vim72.orig/src/misc1.c 2008-07-12 12:20:53.000000000 -0700 4079 +++ vim72/src/misc1.c 2009-0 2-22 21:57:28.916594496-08004279 +++ vim72/src/misc1.c 2009-03-01 11:07:42.767327000 -0800 4080 4280 @@ -3245,9 +3245,9 @@ 4081 4281 … … 4092 4292 diff -Naur vim72.orig/src/misc2.c vim72/src/misc2.c 4093 4293 --- vim72.orig/src/misc2.c 2008-07-23 12:12:56.000000000 -0700 4094 +++ vim72/src/misc2.c 2009-0 2-22 21:57:51.770060343 -08004294 +++ vim72/src/misc2.c 2009-03-01 11:12:37.162193043 -0800 4095 4295 @@ -873,7 +873,7 @@ 4096 4296 /* 3. check for available memory: call mch_avail_mem() */ … … 4102 4302 } 4103 4303 else 4104 @@ -1257,7 +1257,6 @@ 4304 @@ -1010,6 +1010,9 @@ 4305 # if defined(FEAT_PROFILE) 4306 do_cmdline_cmd((char_u *)"profdel *"); 4307 # endif 4308 +# if defined(FEAT_KEYMAP) 4309 + do_cmdline_cmd((char_u *)"set keymap="); 4310 +#endif 4311 4312 # ifdef FEAT_TITLE 4313 free_titles(); 4314 @@ -1034,6 +1037,9 @@ 4315 free_regexp_stuff(); 4316 free_tag_stuff(); 4317 free_cd_dir(); 4318 +# ifdef FEAT_SIGNS 4319 + free_signs(); 4320 +# endif 4321 # ifdef FEAT_EVAL 4322 set_expr_line(NULL); 4323 # endif 4324 @@ -1257,7 +1263,6 @@ 4105 4325 return escaped_string; 4106 4326 } … … 4110 4330 * Return TRUE when 'shell' has "csh" in the tail. 4111 4331 */ 4112 @@ -1266,9 +12 65,7 @@4332 @@ -1266,9 +1271,7 @@ 4113 4333 { 4114 4334 return (strstr((char *)gettail(p_sh), "csh") != NULL); … … 4120 4340 * Escape "string" for use as a shell argument with system(). 4121 4341 * This uses single quotes, except when we know we need to use double qoutes 4122 @@ -1391,7 +13 88,6 @@4342 @@ -1391,7 +1394,6 @@ 4123 4343 4124 4344 return escaped_string; … … 4128 4348 /* 4129 4349 * Like vim_strsave(), but make all characters uppercase. 4130 @@ -2565,7 +256 1,7 @@4350 @@ -2565,7 +2567,7 @@ 4131 4351 int key; 4132 4352 int dlen = 0; … … 4137 4357 return 0; 4138 4358 4139 @@ -2601,10 +2 597,11 @@4359 @@ -2601,10 +2603,11 @@ 4140 4360 * returns 0 if there is no match. 4141 4361 */ … … 4151 4371 char_u *last_dash; 4152 4372 char_u *end_of_name; 4153 @@ -2672,7 +26 69,8 @@4373 @@ -2672,7 +2675,8 @@ 4154 4374 else 4155 4375 { … … 4161 4381 4162 4382 /* 4163 @@ -4698,7 +4 696,8 @@4383 @@ -4698,7 +4702,8 @@ 4164 4384 stackp->ffs_filearray_cur = i + 1; 4165 4385 ff_push(search_ctx, stackp); … … 4173 4393 diff -Naur vim72.orig/src/move.c vim72/src/move.c 4174 4394 --- vim72.orig/src/move.c 2008-07-12 09:26:47.000000000 -0700 4175 +++ vim72/src/move.c 2009-0 2-22 21:57:36.281067746-08004395 +++ vim72/src/move.c 2009-03-01 11:08:10.621111607 -0800 4176 4396 @@ -280,18 +280,20 @@ 4177 4397 … … 4223 4443 diff -Naur vim72.orig/src/nbdebug.c vim72/src/nbdebug.c 4224 4444 --- vim72.orig/src/nbdebug.c 2008-06-22 08:38:58.000000000 -0700 4225 +++ vim72/src/nbdebug.c 2009-0 2-22 21:58:03.030781673-08004445 +++ vim72/src/nbdebug.c 2009-03-01 11:12:09.456415979 -0800 4226 4446 @@ -33,7 +33,6 @@ 4227 4447 u_int nb_dlevel = 0; /* nb_debug verbosity level */ … … 4284 4504 diff -Naur vim72.orig/src/nbdebug.h vim72/src/nbdebug.h 4285 4505 --- vim72.orig/src/nbdebug.h 2008-06-22 07:31:50.000000000 -0700 4286 +++ vim72/src/nbdebug.h 2009-0 2-22 21:58:03.030781673-08004506 +++ vim72/src/nbdebug.h 2009-03-01 11:12:09.456415979 -0800 4287 4507 @@ -43,8 +43,6 @@ 4288 4508 … … 4316 4536 diff -Naur vim72.orig/src/netbeans.c vim72/src/netbeans.c 4317 4537 --- vim72.orig/src/netbeans.c 2008-07-13 09:19:54.000000000 -0700 4318 +++ vim72/src/netbeans.c 2009-0 2-22 21:58:03.022781673-08004538 +++ vim72/src/netbeans.c 2009-03-01 11:12:06.976258974 -0800 4319 4539 @@ -1043,7 +1043,7 @@ 4320 4540 nbdebug(("EVT: %s", buf)); … … 4432 4652 diff -Naur vim72.orig/src/normal.c vim72/src/normal.c 4433 4653 --- vim72.orig/src/normal.c 2008-07-31 13:03:08.000000000 -0700 4434 +++ vim72/src/normal.c 2009-0 2-22 21:58:02.962778041-08004654 +++ vim72/src/normal.c 2009-03-01 11:11:54.535461935 -0800 4435 4655 @@ -183,6 +183,8 @@ 4436 4656 static void nv_cursorhold __ARGS((cmdarg_T *cap)); … … 4710 4930 diff -Naur vim72.orig/src/ops.c vim72/src/ops.c 4711 4931 --- vim72.orig/src/ops.c 2008-06-21 13:08:59.000000000 -0700 4712 +++ vim72/src/ops.c 2009-0 2-22 21:57:40.765356613-08004932 +++ vim72/src/ops.c 2009-03-01 11:10:00.468150579 -0800 4713 4933 @@ -2209,12 +2209,15 @@ 4714 4934 { … … 4731 4951 diff -Naur vim72.orig/src/option.c vim72/src/option.c 4732 4952 --- vim72.orig/src/option.c 2008-07-18 06:05:33.000000000 -0700 4733 +++ vim72/src/option.c 2009-0 2-22 21:58:02.966778320-08004953 +++ vim72/src/option.c 2009-03-01 11:11:54.539461935 -0800 4734 4954 @@ -2593,13 +2593,13 @@ 4735 4955 #ifdef FEAT_VIMINFO … … 5149 5369 diff -Naur vim72.orig/src/os_unix.c vim72/src/os_unix.c 5150 5370 --- vim72.orig/src/os_unix.c 2008-08-06 04:01:40.000000000 -0700 5151 +++ vim72/src/os_unix.c 2009-0 2-22 21:58:03.102786422-08005371 +++ vim72/src/os_unix.c 2009-03-01 11:12:24.577385947 -0800 5152 5372 @@ -315,12 +315,15 @@ 5153 5373 {-1, "Unknown!", FALSE} … … 5382 5602 diff -Naur vim72.orig/src/proto/eval.pro vim72/src/proto/eval.pro 5383 5603 --- vim72.orig/src/proto/eval.pro 2008-08-09 07:31:25.000000000 -0700 5384 +++ vim72/src/proto/eval.pro 2009-0 2-22 21:57:36.373071657-08005604 +++ vim72/src/proto/eval.pro 2009-03-01 11:08:25.566070959 -0800 5385 5605 @@ -17,7 +17,7 @@ 5386 5606 int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip)); … … 5424 5644 diff -Naur vim72.orig/src/proto/ex_cmds.pro vim72/src/proto/ex_cmds.pro 5425 5645 --- vim72.orig/src/proto/ex_cmds.pro 2008-08-09 07:31:25.000000000 -0700 5426 +++ vim72/src/proto/ex_cmds.pro 2009-0 2-22 21:57:28.916594496-08005646 +++ vim72/src/proto/ex_cmds.pro 2009-03-01 11:12:37.166193602 -0800 5427 5647 @@ -11,7 +11,7 @@ 5428 5648 char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp)); … … 5434 5654 int viminfo_readline __ARGS((vir_T *virp)); 5435 5655 char_u *viminfo_readstring __ARGS((vir_T *virp, int off, int convert)); 5656 @@ -40,6 +40,7 @@ 5657 int read_viminfo_sub_string __ARGS((vir_T *virp, int force)); 5658 void write_viminfo_sub_string __ARGS((FILE *fp)); 5659 void free_old_sub __ARGS((void)); 5660 +void free_signs __ARGS((void)); 5661 int prepare_tagpreview __ARGS((int undo_sync)); 5662 void ex_help __ARGS((exarg_T *eap)); 5663 char_u *check_help_lang __ARGS((char_u *arg)); 5436 5664 diff -Naur vim72.orig/src/proto/ex_getln.pro vim72/src/proto/ex_getln.pro 5437 5665 --- vim72.orig/src/proto/ex_getln.pro 2008-08-09 07:31:28.000000000 -0700 5438 +++ vim72/src/proto/ex_getln.pro 2009-0 2-22 21:57:40.525339851 -08005666 +++ vim72/src/proto/ex_getln.pro 2009-03-01 11:08:34.934671881 -0800 5439 5667 @@ -31,7 +31,7 @@ 5440 5668 void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col)); … … 5448 5676 diff -Naur vim72.orig/src/proto/mark.pro vim72/src/proto/mark.pro 5449 5677 --- vim72.orig/src/proto/mark.pro 2008-08-09 07:31:36.000000000 -0700 5450 +++ vim72/src/proto/mark.pro 2009-0 2-22 21:57:28.916594496-08005678 +++ vim72/src/proto/mark.pro 2009-03-01 11:07:42.771327000 -0800 5451 5679 @@ -26,5 +26,5 @@ 5452 5680 void write_viminfo_filemarks __ARGS((FILE *fp)); … … 5458 5686 diff -Naur vim72.orig/src/proto/misc2.pro vim72/src/proto/misc2.pro 5459 5687 --- vim72.orig/src/proto/misc2.pro 2008-08-09 07:31:40.000000000 -0700 5460 +++ vim72/src/proto/misc2.pro 2009-0 2-22 21:57:46.089694370-08005688 +++ vim72/src/proto/misc2.pro 2009-03-01 11:10:23.869653024 -0800 5461 5689 @@ -59,7 +59,7 @@ 5462 5690 int handle_x_keys __ARGS((int key)); … … 5470 5698 diff -Naur vim72.orig/src/proto/netbeans.pro vim72/src/proto/netbeans.pro 5471 5699 --- vim72.orig/src/proto/netbeans.pro 2008-08-09 07:31:56.000000000 -0700 5472 +++ vim72/src/proto/netbeans.pro 2009-0 2-22 21:57:51.698055873-08005700 +++ vim72/src/proto/netbeans.pro 2009-03-01 11:10:39.070626065 -0800 5473 5701 @@ -11,7 +11,7 @@ 5474 5702 void netbeans_frame_moved __ARGS((int new_x, int new_y)); … … 5482 5710 diff -Naur vim72.orig/src/proto/option.pro vim72/src/proto/option.pro 5483 5711 --- vim72.orig/src/proto/option.pro 2008-08-09 07:31:43.000000000 -0700 5484 +++ vim72/src/proto/option.pro 2009-0 2-22 21:58:02.966778320-08005712 +++ vim72/src/proto/option.pro 2009-03-01 11:11:54.539461935 -0800 5485 5713 @@ -44,6 +44,7 @@ 5486 5714 void set_context_in_set_cmd __ARGS((expand_T *xp, char_u *arg, int opt_flags)); … … 5493 5721 diff -Naur vim72.orig/src/pty.c vim72/src/pty.c 5494 5722 --- vim72.orig/src/pty.c 2008-06-21 11:52:58.000000000 -0700 5495 +++ vim72/src/pty.c 2009-0 2-22 21:57:25.600383852-08005723 +++ vim72/src/pty.c 2009-03-01 11:05:15.481889369 -0800 5496 5724 @@ -270,9 +270,10 @@ 5497 5725 } … … 5509 5737 diff -Naur vim72.orig/src/quickfix.c vim72/src/quickfix.c 5510 5738 --- vim72.orig/src/quickfix.c 2008-07-18 05:53:02.000000000 -0700 5511 +++ vim72/src/quickfix.c 2009-0 2-22 21:58:03.086785863-08005739 +++ vim72/src/quickfix.c 2009-03-01 11:12:22.073226148 -0800 5512 5740 @@ -1419,6 +1419,7 @@ 5513 5741 int opened_window = FALSE; … … 5606 5834 diff -Naur vim72.orig/src/regexp.c vim72/src/regexp.c 5607 5835 --- vim72.orig/src/regexp.c 2008-08-07 12:58:50.000000000 -0700 5608 +++ vim72/src/regexp.c 2009-0 2-22 21:58:03.014779438-08005836 +++ vim72/src/regexp.c 2009-03-01 11:12:04.508100572 -0800 5609 5837 @@ -4532,7 +4532,7 @@ 5610 5838 cleanup_subexpr(); … … 5643 5871 diff -Naur vim72.orig/src/screen.c vim72/src/screen.c 5644 5872 --- vim72.orig/src/screen.c 2008-07-24 07:45:07.000000000 -0700 5645 +++ vim72/src/screen.c 2009-0 2-22 21:58:03.114787819-08005873 +++ vim72/src/screen.c 2009-03-01 11:12:27.069546305 -0800 5646 5874 @@ -2439,9 +2439,17 @@ 5647 5875 … … 5760 5988 diff -Naur vim72.orig/src/spell.c vim72/src/spell.c 5761 5989 --- vim72.orig/src/spell.c 2008-07-12 12:20:55.000000000 -0700 5762 +++ vim72/src/spell.c 2009-0 2-22 21:58:02.914775247-08005990 +++ vim72/src/spell.c 2009-03-01 11:11:46.782964939 -0800 5763 5991 @@ -77,7 +77,7 @@ 5764 5992 … … 6631 6859 diff -Naur vim72.orig/src/structs.h vim72/src/structs.h 6632 6860 --- vim72.orig/src/structs.h 2008-07-30 13:02:50.000000000 -0700 6633 +++ vim72/src/structs.h 2009-0 2-22 21:57:36.281067746-08006861 +++ vim72/src/structs.h 2009-03-01 11:08:10.625114401 -0800 6634 6862 @@ -459,7 +459,7 @@ 6635 6863 typedef struct … … 6660 6888 diff -Naur vim72.orig/src/tag.c vim72/src/tag.c 6661 6889 --- vim72.orig/src/tag.c 2008-07-16 14:31:30.000000000 -0700 6662 +++ vim72/src/tag.c 2009-0 2-22 21:58:03.130788378-08006890 +++ vim72/src/tag.c 2009-03-01 11:12:32.157870372 -0800 6663 6891 @@ -515,7 +515,7 @@ 6664 6892 * If a count is supplied to the ":tag <name>" command, then … … 6791 7019 diff -Naur vim72.orig/src/term.c vim72/src/term.c 6792 7020 --- vim72.orig/src/term.c 2008-07-27 04:48:06.000000000 -0700 6793 +++ vim72/src/term.c 2009-0 2-22 21:57:51.754057829-08007021 +++ vim72/src/term.c 2009-03-01 11:10:54.343604693 -0800 6794 7022 @@ -4920,7 +4920,15 @@ 6795 7023 key_name[0] = KEY2TERMCAP0(key); … … 6811 7039 diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile 6812 7040 --- vim72.orig/src/testdir/Makefile 2008-06-19 13:29:46.000000000 -0700 6813 +++ vim72/src/testdir/Makefile 2009-0 2-22 21:57:28.688580807-08007041 +++ vim72/src/testdir/Makefile 2009-03-01 11:05:52.680272943 -0800 6814 7042 @@ -26,15 +26,17 @@ 6815 7043 … … 6845 7073 diff -Naur vim72.orig/src/testdir/Make_ming.mak vim72/src/testdir/Make_ming.mak 6846 7074 --- vim72.orig/src/testdir/Make_ming.mak 1969-12-31 16:00:00.000000000 -0800 6847 +++ vim72/src/testdir/Make_ming.mak 2009-0 2-22 21:57:28.764584997-08007075 +++ vim72/src/testdir/Make_ming.mak 2009-03-01 11:06:57.588433300 -0800 6848 7076 @@ -0,0 +1,91 @@ 6849 7077 +# Makefile to run tests for Vim, on Dos-like machines … … 6940 7168 diff -Naur vim72.orig/src/testdir/test42.ok vim72/src/testdir/test42.ok 6941 7169 --- vim72.orig/src/testdir/test42.ok 2008-02-20 04:27:37.000000000 -0800 6942 +++ vim72/src/testdir/test42.ok 2009-0 2-22 21:57:28.948596172-08007170 +++ vim72/src/testdir/test42.ok 2009-03-01 11:07:47.727646598 -0800 6943 7171 @@ -20,7 +20,7 @@ 6944 7172 ucs-2 … … 6952 7180 diff -Naur vim72.orig/src/ui.c vim72/src/ui.c 6953 7181 --- vim72.orig/src/ui.c 2008-07-14 11:14:56.000000000 -0700 6954 +++ vim72/src/ui.c 2009-0 2-22 21:57:40.653347953-08007182 +++ vim72/src/ui.c 2009-03-01 11:08:45.651358290 -0800 6955 7183 @@ -1820,7 +1820,7 @@ 6956 7184 #ifdef HAVE_DUP … … 7060 7288 diff -Naur vim72.orig/src/version.c vim72/src/version.c 7061 7289 --- vim72.orig/src/version.c 2008-08-09 07:24:52.000000000 -0700 7062 +++ vim72/src/version.c 2009-0 2-22 21:58:03.130788378-08007063 @@ -677,9 +677,2 48@@7290 +++ vim72/src/version.c 2009-03-01 11:12:42.142512361 -0800 7291 @@ -677,9 +677,256 @@ 7064 7292 static int included_patches[] = 7065 7293 { /* Add new patch number below this line */ 7066 7294 /**/ 7295 + 128, 7296 +/**/ 7297 + 127, 7298 +/**/ 7299 + 126, 7300 +/**/ 7301 + 125, 7302 +/**/ 7067 7303 + 124, 7068 7304 +/**/ … … 7310 7546 highest_patch() 7311 7547 { 7312 @@ -786,7 +10 25,7 @@7548 @@ -786,7 +1033,7 @@ 7313 7549 MSG_PUTS(_("\nRISC OS version")); 7314 7550 #endif … … 7319 7555 if (*compiled_arch != NUL) 7320 7556 { 7321 @@ -825,6 +10 64,19 @@7557 @@ -825,6 +1072,19 @@ 7322 7558 } 7323 7559 } … … 7341 7577 diff -Naur vim72.orig/src/vim.h vim72/src/vim.h 7342 7578 --- vim72.orig/src/vim.h 2008-08-09 09:03:38.000000000 -0700 7343 +++ vim72/src/vim.h 2009-0 2-22 21:58:03.090785025-08007579 +++ vim72/src/vim.h 2009-03-01 11:12:22.073226148 -0800 7344 7580 @@ -341,8 +341,14 @@ 7345 7581 #ifdef BACKSLASH_IN_FILENAME … … 7409 7645 diff -Naur vim72.orig/src/window.c vim72/src/window.c 7410 7646 --- vim72.orig/src/window.c 2008-08-06 04:00:30.000000000 -0700 7411 +++ vim72/src/window.c 2009-0 2-22 21:58:03.090785025-08007647 +++ vim72/src/window.c 2009-03-01 11:12:22.073226148 -0800 7412 7648 @@ -12,7 +12,7 @@ 7413 7649 static int path_is_url __ARGS((char_u *p)); … … 7500 7736 diff -Naur vim72.orig/src/workshop.c vim72/src/workshop.c 7501 7737 --- vim72.orig/src/workshop.c 2008-06-21 11:53:26.000000000 -0700 7502 +++ vim72/src/workshop.c 2009-0 2-22 21:57:40.565341248-08007738 +++ vim72/src/workshop.c 2009-03-01 11:08:39.914989523 -0800 7503 7739 @@ -1121,8 +1121,12 @@ 7504 7740 ? (char *)curbuf->b_sfname : "<None>");
Note:
See TracChangeset
for help on using the changeset viewer.