Changeset 43c52a1


Ignore:
Timestamp:
Jan 8, 2009, 9:02:59 PM (16 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
c61f77f
Parents:
2803d79
Message:

VIM Branch Update Patch to -4

Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/introduction/common/changelog.xml

    r2803d79 r43c52a1  
    5959        </listitem>
    6060        <listitem>
    61           <para>[Jim] - Updated GCC Branch Update  Patch to -4.</para>
     61          <para>[Jim] - Updated GCC Branch Update Patch to -4.</para>
     62        </listitem>
     63        <listitem>
     64          <para>[Jim] - Updated VIM Branch Update Patch to -4.</para>
    6265        </listitem>
    6366      </itemizedlist>

  • BOOK/patches.ent

    r2803d79 r43c52a1  
    113113<!ENTITY tar-revert_pipe_drain-patch-size "4 KB">
    114114
    115 <!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-3.patch">
    116 <!ENTITY vim-branch_update-patch-md5 "8a08f1a9562183a0214595c915565078">
    117 <!ENTITY vim-branch_update-patch-size "168 KB">
     115<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-4.patch">
     116<!ENTITY vim-branch_update-patch-md5 "34dba3fff5504b103ff8bb1010f06116">
     117<!ENTITY vim-branch_update-patch-size "172 KB">
    118118
    119119<!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">

  • patches/vim-7.2-branch_update-4.patch

    r2803d79 r43c52a1  
    1 Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
    2 Date: 12-30-2008
     1Submitted By: Jim Gifford (jim at cross-lfs dot org)
     2Date: 01-08-2009
    33Initial Package Version: 7.2
    44Origin: Upstream
    55Upstream Status: Applied
    6 Description: Contains all upstream patches up to 7.2.076
     6Description: Contains all upstream patches up to 7.2.079
    77             The following patches were skipped
    88             007 036 041 049 071 072 074
    … …  
    1010diff -Naur vim72.orig/Filelist vim72/Filelist
    1111--- vim72.orig/Filelist 2008-07-06 11:02:23.000000000 -0700
    12 +++ vim72/Filelist      2008-12-30 16:15:18.000000000 -0800
     12+++ vim72/Filelist      2009-01-08 20:57:31.000000000 -0800
    1313@@ -285,6 +285,7 @@
    1414                src/proto/os_win32.pro \
    … …  
    2121diff -Naur vim72.orig/runtime/doc/cmdline.txt vim72/runtime/doc/cmdline.txt
    2222--- vim72.orig/runtime/doc/cmdline.txt  2008-08-09 07:22:59.000000000 -0700
    23 +++ vim72/runtime/doc/cmdline.txt       2008-12-30 16:15:47.000000000 -0800
     23+++ vim72/runtime/doc/cmdline.txt       2009-01-08 20:57:32.000000000 -0800
    2424@@ -1,4 +1,4 @@
    2525-*cmdline.txt*   For Vim version 7.2.  Last change: 2008 Jul 29
    … …  
    8080diff -Naur vim72.orig/runtime/doc/eval.txt vim72/runtime/doc/eval.txt
    8181--- vim72.orig/runtime/doc/eval.txt     2008-08-09 07:22:59.000000000 -0700
    82 +++ vim72/runtime/doc/eval.txt  2008-12-30 16:17:36.000000000 -0800
     82+++ vim72/runtime/doc/eval.txt  2009-01-08 20:57:45.000000000 -0800
    8383@@ -1,4 +1,4 @@
    8484-*eval.txt*     For Vim version 7.2.  Last change: 2008 Aug 09
    … …  
    198198 multi_lang             Compiled with support for multiple languages.
    199199 mzscheme               Compiled with MzScheme interface |mzscheme|.
     200diff -Naur vim72.orig/runtime/doc/netbeans.txt vim72/runtime/doc/netbeans.txt
     201--- vim72.orig/runtime/doc/netbeans.txt 2008-08-09 07:22:59.000000000 -0700
     202+++ vim72/runtime/doc/netbeans.txt      2009-01-08 20:57:54.000000000 -0800
     203@@ -1,4 +1,4 @@
     204-*netbeans.txt*  For Vim version 7.2.  Last change: 2008 Jun 28
     205+*netbeans.txt*  For Vim version 7.2.  Last change: 2009 Jan 06
     206 
     207 
     208                  VIM REFERENCE MANUAL    by Gordon Prieur et al.
     209@@ -722,8 +722,10 @@
     210                of the cursor.
     211                New in version 2.1.
     212 
     213-killed         A file was closed by the user.  Only for files that have been
     214-               assigned a number by the IDE.
     215+killed         A file was deleted or wiped out by the user and the buffer
     216+               annotations have been removed.  The bufID number for this
     217+               buffer has become invalid.  Only for files that have been
     218+               assigned a bufID number by the IDE.
     219 
     220 newDotAndMark off off
     221                Reports the position of the cursor being at "off" bytes into
    200222diff -Naur vim72.orig/runtime/doc/options.txt vim72/runtime/doc/options.txt
    201223--- vim72.orig/runtime/doc/options.txt  2008-08-09 07:22:59.000000000 -0700
    202 +++ vim72/runtime/doc/options.txt       2008-12-30 16:16:50.000000000 -0800
     224+++ vim72/runtime/doc/options.txt       2009-01-08 20:57:43.000000000 -0800
    203225@@ -1,4 +1,4 @@
    204226-*options.txt*  For Vim version 7.2.  Last change: 2008 Aug 06
    … …  
    220242diff -Naur vim72.orig/runtime/doc/spell.txt vim72/runtime/doc/spell.txt
    221243--- vim72.orig/runtime/doc/spell.txt    2008-08-09 07:23:00.000000000 -0700
    222 +++ vim72/runtime/doc/spell.txt 2008-12-30 16:17:18.000000000 -0800
     244+++ vim72/runtime/doc/spell.txt 2009-01-08 20:57:45.000000000 -0800
    223245@@ -1,4 +1,4 @@
    224246-*spell.txt*    For Vim version 7.2.  Last change: 2008 Jun 21
    … …  
    350372diff -Naur vim72.orig/runtime/doc/starting.txt vim72/runtime/doc/starting.txt
    351373--- vim72.orig/runtime/doc/starting.txt 2008-08-09 07:23:00.000000000 -0700
    352 +++ vim72/runtime/doc/starting.txt      2008-12-30 16:15:47.000000000 -0800
     374+++ vim72/runtime/doc/starting.txt      2009-01-08 20:57:32.000000000 -0800
    353375@@ -1,4 +1,4 @@
    354376-*starting.txt*  For Vim version 7.2.  Last change: 2008 Jun 21
    … …  
    412434diff -Naur vim72.orig/runtime/doc/usr_21.txt vim72/runtime/doc/usr_21.txt
    413435--- vim72.orig/runtime/doc/usr_21.txt   2008-08-09 07:23:01.000000000 -0700
    414 +++ vim72/runtime/doc/usr_21.txt        2008-12-30 16:15:47.000000000 -0800
     436+++ vim72/runtime/doc/usr_21.txt        2009-01-08 20:57:32.000000000 -0800
    415437@@ -1,4 +1,4 @@
    416438-*usr_21.txt*   For Vim version 7.2.  Last change: 2007 May 01
    … …  
    479501diff -Naur vim72.orig/runtime/scripts.vim vim72/runtime/scripts.vim
    480502--- vim72.orig/runtime/scripts.vim      2008-08-08 15:27:21.000000000 -0700
    481 +++ vim72/runtime/scripts.vim   2008-12-30 16:14:26.000000000 -0800
     503+++ vim72/runtime/scripts.vim   2009-01-08 20:57:27.000000000 -0800
    482504@@ -234,6 +234,10 @@
    483505   elseif s:line1 =~ '\<DTD\s\+XHTML\s'
    … …  
    493515diff -Naur vim72.orig/src/auto/configure vim72/src/auto/configure
    494516--- vim72.orig/src/auto/configure       2008-07-24 05:40:36.000000000 -0700
    495 +++ vim72/src/auto/configure    2008-12-30 16:16:27.000000000 -0800
     517+++ vim72/src/auto/configure    2009-01-08 20:57:39.000000000 -0800
    496518@@ -16819,21 +16819,29 @@
    497519   LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
    … …  
    534556diff -Naur vim72.orig/src/buffer.c vim72/src/buffer.c
    535557--- vim72.orig/src/buffer.c     2008-08-06 04:00:48.000000000 -0700
    536 +++ vim72/src/buffer.c  2008-12-30 16:17:24.000000000 -0800
     558+++ vim72/src/buffer.c  2009-01-08 20:57:54.000000000 -0800
     559@@ -437,10 +437,6 @@
     560        return;
     561 #endif
     562 
     563-#ifdef FEAT_NETBEANS_INTG
     564-    if (usingNetbeans)
     565-       netbeans_file_closed(buf);
     566-#endif
     567     /* Change directories when the 'acd' option is set. */
     568     DO_AUTOCHDIR
     569 
     570@@ -639,6 +635,10 @@
     571 #ifdef FEAT_SIGNS
     572     buf_delete_signs(buf);             /* delete any signs */
     573 #endif
     574+#ifdef FEAT_NETBEANS_INTG
     575+    if (usingNetbeans)
     576+        netbeans_file_killed(buf);
     577+#endif
     578 #ifdef FEAT_LOCALMAP
     579     map_clear_int(buf, MAP_ALL_MODES, TRUE, FALSE);  /* clear local mappings */
     580     map_clear_int(buf, MAP_ALL_MODES, TRUE, TRUE);   /* clear local abbrevs */
    537581@@ -647,6 +647,9 @@
    538582     vim_free(buf->b_start_fenc);
    … …  
    545589 
    546590 /*
    547 @@ -1237,7 +1240,7 @@
     591@@ -812,9 +815,6 @@
     592     int                bnr;            /* buffer number */
     593     char_u     *p;
     594 
     595-#ifdef FEAT_NETBEANS_INTG
     596-    netbeansCloseFile = 1;
     597-#endif
     598     if (addr_count == 0)
     599     {
     600        (void)do_buffer(command, DOBUF_CURRENT, FORWARD, 0, forceit);
     601@@ -909,9 +909,6 @@
     602        }
     603     }
     604 
     605-#ifdef FEAT_NETBEANS_INTG
     606-    netbeansCloseFile = 0;
     607-#endif
     608 
     609     return errormsg;
     610 }
     611@@ -1237,7 +1234,7 @@
    548612         * "buf" if one exists */
    549613        if ((swb_flags & SWB_USEOPEN) && buf_jump_open_win(buf))
    … …  
    554618        if ((swb_flags & SWB_USETAB) && buf_jump_open_tab(buf))
    555619            return OK;
    556 @@ -1351,11 +1354,12 @@
     620@@ -1351,11 +1348,12 @@
    557621        }
    558622     }
    … …  
    570634 #endif
    571635        enter_buffer(buf);
    572 @@ -1397,6 +1401,9 @@
     636@@ -1397,6 +1395,9 @@
    573637     curwin->w_cursor.coladd = 0;
    574638 #endif
    … …  
    580644     /* Make sure the buffer is loaded. */
    581645     if (curbuf->b_ml.ml_mfp == NULL)   /* need to load the file */
    582 @@ -1436,7 +1443,8 @@
     646@@ -1436,7 +1437,8 @@
    583647     maketitle();
    584648 #endif
    … …  
    590654        scroll_cursor_halfway(FALSE);   /* redisplay at correct position */
    591655 
    592 @@ -3963,7 +3971,7 @@
     656@@ -3963,7 +3965,7 @@
    593657     width = vim_strsize(out);
    594658     if (maxwidth > 0 && width > maxwidth)
    … …  
    599663        if (itemcnt == 0)
    600664            s = out;
    601 @@ -5062,7 +5070,7 @@
     665@@ -5062,7 +5064,7 @@
    602666     {
    603667        if (buf->b_sfname != NULL)
    … …  
    610674diff -Naur vim72.orig/src/configure.in vim72/src/configure.in
    611675--- vim72.orig/src/configure.in 2008-07-24 05:40:26.000000000 -0700
    612 +++ vim72/src/configure.in      2008-12-30 16:16:27.000000000 -0800
     676+++ vim72/src/configure.in      2009-01-08 20:57:39.000000000 -0800
    613677@@ -3152,18 +3152,25 @@
    614678 dnl But only when making dependencies, cproto and lint don't take "-isystem".
    … …  
    645709diff -Naur vim72.orig/src/diff.c vim72/src/diff.c
    646710--- vim72.orig/src/diff.c       2008-03-05 03:16:56.000000000 -0800
    647 +++ vim72/src/diff.c    2008-12-30 16:17:15.000000000 -0800
     711+++ vim72/src/diff.c    2009-01-08 20:57:45.000000000 -0800
    648712@@ -73,6 +73,8 @@
    649713        {
    … …  
    735799diff -Naur vim72.orig/src/eval.c vim72/src/eval.c
    736800--- vim72.orig/src/eval.c       2008-08-07 12:37:22.000000000 -0700
    737 +++ vim72/src/eval.c    2008-12-30 16:17:49.000000000 -0800
     801+++ vim72/src/eval.c    2009-01-08 20:57:46.000000000 -0800
    738802@@ -32,6 +32,9 @@
    739803 
    … …  
    15591623diff -Naur vim72.orig/src/ex_cmds.c vim72/src/ex_cmds.c
    15601624--- vim72.orig/src/ex_cmds.c    2008-08-04 12:15:00.000000000 -0700
    1561 +++ vim72/src/ex_cmds.c 2008-12-30 16:17:03.000000000 -0800
     1625+++ vim72/src/ex_cmds.c 2009-01-08 20:57:44.000000000 -0800
    15621626@@ -24,7 +24,7 @@
    15631627 static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out));
    … …  
    16881752diff -Naur vim72.orig/src/ex_cmds.h vim72/src/ex_cmds.h
    16891753--- vim72.orig/src/ex_cmds.h    2008-06-21 11:47:57.000000000 -0700
    1690 +++ vim72/src/ex_cmds.h 2008-12-30 16:15:47.000000000 -0800
     1754+++ vim72/src/ex_cmds.h 2009-01-08 20:57:32.000000000 -0800
    16911755@@ -278,7 +278,7 @@
    16921756 EX(CMD_crewind,                "crewind",      ex_cc,
    … …  
    17361800diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c
    17371801--- vim72.orig/src/ex_cmds2.c   2008-07-13 09:18:22.000000000 -0700
    1738 +++ vim72/src/ex_cmds2.c        2008-12-30 16:14:45.000000000 -0800
     1802+++ vim72/src/ex_cmds2.c        2009-01-08 20:57:30.000000000 -0800
    17391803@@ -3145,8 +3145,8 @@
    17401804        verbose_leave();
    … …  
    17501814diff -Naur vim72.orig/src/ex_docmd.c vim72/src/ex_docmd.c
    17511815--- vim72.orig/src/ex_docmd.c   2008-07-26 04:51:05.000000000 -0700
    1752 +++ vim72/src/ex_docmd.c        2008-12-30 16:17:40.000000000 -0800
     1816+++ vim72/src/ex_docmd.c        2009-01-08 20:57:45.000000000 -0800
    17531817@@ -364,6 +364,7 @@
    17541818 # define ex_function           ex_ni
    … …  
    18931957diff -Naur vim72.orig/src/ex_getln.c vim72/src/ex_getln.c
    18941958--- vim72.orig/src/ex_getln.c   2008-08-08 02:31:33.000000000 -0700
    1895 +++ vim72/src/ex_getln.c        2008-12-30 16:16:50.000000000 -0800
     1959+++ vim72/src/ex_getln.c        2009-01-08 20:57:43.000000000 -0800
    18961960@@ -31,6 +31,8 @@
    18971961     int                cmdattr;        /* attributes for prompt */
    … …  
    20272091diff -Naur vim72.orig/src/feature.h vim72/src/feature.h
    20282092--- vim72.orig/src/feature.h    2008-08-06 04:00:39.000000000 -0700
    2029 +++ vim72/src/feature.h 2008-12-30 16:15:47.000000000 -0800
     2093+++ vim72/src/feature.h 2009-01-08 20:57:32.000000000 -0800
    20302094@@ -767,9 +767,13 @@
    20312095 
    … …  
    20462110diff -Naur vim72.orig/src/fileio.c vim72/src/fileio.c
    20472111--- vim72.orig/src/fileio.c     2008-08-06 04:01:03.000000000 -0700
    2048 +++ vim72/src/fileio.c  2008-12-30 16:18:07.000000000 -0800
     2112+++ vim72/src/fileio.c  2009-01-08 20:57:54.000000000 -0800
    20492113@@ -932,7 +932,10 @@
    20502114     else
    … …  
    21312195        } while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n');
    21322196     }
    2133 @@ -6120,6 +6119,47 @@
     2197@@ -6107,12 +6106,24 @@
     2198 #ifdef HAVE_ACL
     2199     vim_acl_T  acl;            /* ACL from original file */
     2200 #endif
     2201+#if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME)
     2202+    int                use_tmp_file = FALSE;
     2203+#endif
     2204 
     2205     /*
     2206-     * When the names are identical, there is nothing to do.
     2207+     * When the names are identical, there is nothing to do.  When they refer
     2208+     * to the same file (ignoring case and slash/backslash differences) but
     2209+     * the file name differs we need to go through a temp file.
     2210      */
     2211     if (fnamecmp(from, to) == 0)
     2212-       return 0;
     2213+    {
     2214+#ifdef CASE_INSENSITIVE_FILENAME
     2215+       if (STRCMP(gettail(from), gettail(to)) != 0)
     2216+           use_tmp_file = TRUE;
     2217+       else
     2218+#endif
     2219+           return 0;
     2220+    }
     2221 
     2222     /*
     2223      * Fail if the "from" file doesn't exist.  Avoids that "to" is deleted.
     2224@@ -6120,6 +6131,55 @@
    21342225     if (mch_stat((char *)from, &st) < 0)
    21352226        return -1;
    … …  
    21382229+    {
    21392230+       struct stat     st_to;
    2140 +       char            tempname[MAXPATHL + 1];
    21412231+
    21422232+       /* It's possible for the source and destination to be the same file.
    … …  
    21462236+               && st.st_dev == st_to.st_dev
    21472237+               && st.st_ino == st_to.st_ino)
     2238+           use_tmp_file = TRUE;
     2239+    }
     2240+#endif
     2241+
     2242+#if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME)
     2243+    if (use_tmp_file)
     2244+    {
     2245+       char    tempname[MAXPATHL + 1];
     2246+
     2247+       /*
     2248+        * Find a name that doesn't exist and is in the same directory.
     2249+        * Rename "from" to "tempname" and then rename "tempname" to "to".
     2250+        */
     2251+       if (STRLEN(from) >= MAXPATHL - 5)
     2252+           return -1;
     2253+       STRCPY(tempname, from);
     2254+       for (n = 123; n < 99999; ++n)
    21482255+       {
    2149 +           /* Find a name that doesn't exist and is in the same directory.
    2150 +            * Move "from" to "tempname" and then to "to". */
    2151 +           if (STRLEN(from) >= MAXPATHL - 5)
    2152 +               return -1;
    2153 +           STRCPY(tempname, from);
    2154 +           for (n = 123; n < 99999; ++n)
     2256+           sprintf((char *)gettail((char_u *)tempname), "%d", n);
     2257+           if (mch_stat(tempname, &st) < 0)
    21552258+           {
    2156 +               sprintf(gettail(tempname), "%d", n);
    2157 +               if (mch_stat(tempname, &st_to) < 0)
     2259+               if (mch_rename((char *)from, tempname) == 0)
    21582260+               {
    2159 +                   if (mch_rename((char *)from, tempname) == 0)
    2160 +                   {
    2161 +                       if (mch_rename(tempname, (char *)to) == 0)
    2162 +                           return 0;
    2163 +                       /* Strange, the second step failed.  Try moving the
    2164 +                        * file back and return failure. */
    2165 +                       mch_rename(tempname, (char *)from);
    2166 +                       return -1;
    2167 +                   }
    2168 +                   /* If it fails for one temp name it will most likely fail
    2169 +                    * for any temp name, give up. */
     2261+                   if (mch_rename(tempname, (char *)to) == 0)
     2262+                       return 0;
     2263+                   /* Strange, the second step failed.  Try moving the
     2264+                    * file back and return failure. */
     2265+                   mch_rename(tempname, (char *)from);
    21702266+                   return -1;
    21712267+               }
     2268+               /* If it fails for one temp name it will most likely fail
     2269+                * for any temp name, give up. */
     2270+               return -1;
    21722271+           }
    2173 +           return -1;
    21742272+       }
     2273+       return -1;
    21752274+    }
    21762275+#endif
    … …  
    21792278      * Delete the "to" file, this is required on some systems to make the
    21802279      * mch_rename() work, on other systems it makes sure that we don't have
    2181 @@ -8523,6 +8563,7 @@
     2280@@ -8523,6 +8583,7 @@
    21822281     char_u     *save_sourcing_name;
    21832282     linenr_T   save_sourcing_lnum;
    … …  
    21872286     char_u     *save_autocmd_match;
    21882287     int                save_autocmd_busy;
    2189 @@ -8601,6 +8642,7 @@
     2288@@ -8601,6 +8662,7 @@
    21902289      * Save the autocmd_* variables and info about the current buffer.
    21912290      */
    … …  
    21952294     save_autocmd_match = autocmd_match;
    21962295     save_autocmd_busy = autocmd_busy;
    2197 @@ -8618,14 +8660,15 @@
     2296@@ -8618,14 +8680,15 @@
    21982297        if (fname != NULL && *fname != NUL)
    21992298            autocmd_fname = fname;
    … …  
    22132312     /*
    22142313      * Set the buffer number to be used for <abuf>.
    2215 @@ -8810,6 +8853,7 @@
     2314@@ -8810,6 +8873,7 @@
    22162315     sourcing_lnum = save_sourcing_lnum;
    22172316     vim_free(autocmd_fname);
    … …  
    22212320     autocmd_match = save_autocmd_match;
    22222321 #ifdef FEAT_EVAL
    2223 @@ -8918,7 +8962,7 @@
     2322@@ -8918,7 +8982,7 @@
    22242323     {
    22252324        apc->curpat = NULL;
    … …  
    22302329         * buffer number. */
    22312330        if (ap->pat != NULL && ap->cmds != NULL
    2232 @@ -9104,7 +9148,7 @@
     2331@@ -9104,7 +9168,7 @@
    22332332 set_context_in_autocmd(xp, arg, doautocmd)
    22342333     expand_T   *xp;
    … …  
    22412340diff -Naur vim72.orig/src/fold.c vim72/src/fold.c
    22422341--- vim72.orig/src/fold.c       2008-08-06 04:01:12.000000000 -0700
    2243 +++ vim72/src/fold.c    2008-12-30 16:17:03.000000000 -0800
     2342+++ vim72/src/fold.c    2009-01-08 20:57:54.000000000 -0800
    22442343@@ -48,7 +48,7 @@
    22452344 static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));
    … …  
    22512350 static linenr_T setManualFoldWin __ARGS((win_T *wp, linenr_T lnum, int opening, int recurse, int *donep));
    22522351 static void foldOpenNested __ARGS((fold_T *fpr));
    2253 @@ -1241,10 +1241,10 @@
     2352@@ -740,7 +740,7 @@
     2353     garray_T   *found_ga;
     2354     fold_T     *found_fp = NULL;
     2355     linenr_T   found_off = 0;
     2356-    int                use_level = FALSE;
     2357+    int                use_level;
     2358     int                maybe_small = FALSE;
     2359     int                level = 0;
     2360     linenr_T   lnum = start;
     2361@@ -757,6 +757,7 @@
     2362        gap = &curwin->w_folds;
     2363        found_ga = NULL;
     2364        lnum_off = 0;
     2365+       use_level = FALSE;
     2366        for (;;)
     2367        {
     2368            if (!foldFind(gap, lnum - lnum_off, &fp))
     2369@@ -783,20 +784,21 @@
     2370        else
     2371        {
     2372            lnum = found_fp->fd_top + found_fp->fd_len + found_off;
     2373-           did_one = TRUE;
     2374 
     2375            if (foldmethodIsManual(curwin))
     2376                deleteFoldEntry(found_ga,
     2377                    (int)(found_fp - (fold_T *)found_ga->ga_data), recursive);
     2378            else
     2379            {
     2380-               if (found_fp->fd_top + found_off < first_lnum)
     2381-                   first_lnum = found_fp->fd_top;
     2382-               if (lnum > last_lnum)
     2383+               if (first_lnum > found_fp->fd_top + found_off)
     2384+                   first_lnum = found_fp->fd_top + found_off;
     2385+               if (last_lnum < lnum)
     2386                    last_lnum = lnum;
     2387-               parseMarker(curwin);
     2388+               if (!did_one)
     2389+                   parseMarker(curwin);
     2390                deleteFoldMarkers(found_fp, recursive, found_off);
     2391            }
     2392+           did_one = TRUE;
     2393 
     2394            /* redraw window */
     2395            changed_window_setting();
     2396@@ -811,6 +813,10 @@
     2397            redraw_curbuf_later(INVERTED);
     2398 #endif
     2399     }
     2400+    else
     2401+       /* Deleting markers may make cursor column invalid. */
     2402+       check_cursor_col();
     2403+
     2404     if (last_lnum > 0)
     2405        changed_lines(first_lnum, (colnr_T)0, last_lnum, 0L);
     2406 }
     2407@@ -1241,10 +1247,10 @@
    22542408  * Repeat "count" times.
    22552409  */
    … …  
    22642418     int                done;
    22652419     long       n;
    2266 @@ -1252,7 +1252,7 @@
     2420@@ -1252,7 +1258,7 @@
    22672421     for (n = 0; n < count; ++n)
    22682422     {
    … …  
    22752429diff -Naur vim72.orig/src/getchar.c vim72/src/getchar.c
    22762430--- vim72.orig/src/getchar.c    2008-07-22 09:57:48.000000000 -0700
    2277 +++ vim72/src/getchar.c 2008-12-30 16:16:59.000000000 -0800
     2431+++ vim72/src/getchar.c 2009-01-08 20:57:43.000000000 -0800
    22782432@@ -4702,7 +4702,7 @@
    22792433                        return FAIL;
    … …  
    22962450diff -Naur vim72.orig/src/globals.h vim72/src/globals.h
    22972451--- vim72.orig/src/globals.h    2008-07-26 04:53:29.000000000 -0700
    2298 +++ vim72/src/globals.h 2008-12-30 16:17:03.000000000 -0800
     2452+++ vim72/src/globals.h 2009-01-08 20:57:54.000000000 -0800
    22992453@@ -1022,6 +1022,7 @@
    23002454 #endif
    … …  
    23052459 EXTERN char_u  *autocmd_match INIT(= NULL); /* name for <amatch> on cmdline */
    23062460 EXTERN int     did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */
    2307 @@ -1548,6 +1549,14 @@
     2461@@ -1339,7 +1340,6 @@
     2462 
     2463 #ifdef FEAT_NETBEANS_INTG
     2464 EXTERN char *netbeansArg INIT(= NULL); /* the -nb[:host:port:passwd] arg */
     2465-EXTERN int netbeansCloseFile INIT(= 0);        /* send killed if != 0 */
     2466 EXTERN int netbeansFireChanges INIT(= 1); /* send buffer changes if != 0 */
     2467 EXTERN int netbeansForcedQuit INIT(= 0);/* don't write modified files */
     2468 EXTERN int netbeansReadFile INIT(= 1); /* OK to read from disk if != 0 */
     2469@@ -1548,6 +1548,14 @@
    23082470 EXTERN time_t starttime;
    23092471 
    … …  
    23222484diff -Naur vim72.orig/src/gui.c vim72/src/gui.c
    23232485--- vim72.orig/src/gui.c        2008-07-27 12:32:14.000000000 -0700
    2324 +++ vim72/src/gui.c     2008-12-30 16:17:34.000000000 -0800
     2486+++ vim72/src/gui.c     2009-01-08 20:57:45.000000000 -0800
    23252487@@ -139,7 +139,7 @@
    23262488                /* The read returns when the child closes the pipe (or when
    … …  
    24152577diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c
    24162578--- vim72.orig/src/gui_at_sb.c  2004-06-07 07:32:25.000000000 -0700
    2417 +++ vim72/src/gui_at_sb.c       2008-12-30 16:17:03.000000000 -0800
     2579+++ vim72/src/gui_at_sb.c       2009-01-08 20:57:44.000000000 -0800
    24182580@@ -1078,6 +1078,12 @@
    24192581     Cardinal   *num_params;    /* unused */
    … …  
    24412603diff -Naur vim72.orig/src/gui_gtk_x11.c vim72/src/gui_gtk_x11.c
    24422604--- vim72.orig/src/gui_gtk_x11.c        2008-07-04 03:46:24.000000000 -0700
    2443 +++ vim72/src/gui_gtk_x11.c     2008-12-30 16:17:03.000000000 -0800
     2605+++ vim72/src/gui_gtk_x11.c     2009-01-08 20:57:44.000000000 -0800
    24442606@@ -4070,14 +4070,14 @@
    24452607 
    … …  
    24652627diff -Naur vim72.orig/src/gui_x11.c vim72/src/gui_x11.c
    24662628--- vim72.orig/src/gui_x11.c    2008-06-08 08:13:45.000000000 -0700
    2467 +++ vim72/src/gui_x11.c 2008-12-30 16:15:59.000000000 -0800
     2629+++ vim72/src/gui_x11.c 2009-01-08 20:57:33.000000000 -0800
    24682630@@ -2450,7 +2450,7 @@
    24692631        *colorPtr = colortable[closest];
    … …  
    24772639diff -Naur vim72.orig/src/gui_xmdlg.c vim72/src/gui_xmdlg.c
    24782640--- vim72.orig/src/gui_xmdlg.c  2008-06-21 09:05:32.000000000 -0700
    2479 +++ vim72/src/gui_xmdlg.c       2008-12-30 16:17:03.000000000 -0800
     2641+++ vim72/src/gui_xmdlg.c       2009-01-08 20:57:44.000000000 -0800
    24802642@@ -369,10 +369,10 @@
    24812643     char       buf[TEMP_BUF_SIZE];
    … …  
    26332795diff -Naur vim72.orig/src/gui_xmebw.c vim72/src/gui_xmebw.c
    26342796--- vim72.orig/src/gui_xmebw.c  2007-09-06 03:57:51.000000000 -0700
    2635 +++ vim72/src/gui_xmebw.c       2008-12-30 16:17:03.000000000 -0800
     2797+++ vim72/src/gui_xmebw.c       2009-01-08 20:57:44.000000000 -0800
    26362798@@ -1256,7 +1256,7 @@
    26372799     }
    … …  
    26602822diff -Naur vim72.orig/src/if_cscope.c vim72/src/if_cscope.c
    26612823--- vim72.orig/src/if_cscope.c  2008-06-24 09:32:34.000000000 -0700
    2662 +++ vim72/src/if_cscope.c       2008-12-30 16:14:15.000000000 -0800
     2824+++ vim72/src/if_cscope.c       2009-01-08 20:57:27.000000000 -0800
    26632825@@ -74,7 +74,7 @@
    26642826     { "add",   cs_add,
    … …  
    26902852diff -Naur vim72.orig/src/if_cscope.h vim72/src/if_cscope.h
    26912853--- vim72.orig/src/if_cscope.h  2007-09-02 07:51:08.000000000 -0700
    2692 +++ vim72/src/if_cscope.h       2008-12-30 16:14:15.000000000 -0800
     2854+++ vim72/src/if_cscope.h       2009-01-08 20:57:27.000000000 -0800
    26932855@@ -42,17 +42,6 @@
    26942856  * f 7name     Find this file
    … …  
    27112873diff -Naur vim72.orig/src/if_perl.xs vim72/src/if_perl.xs
    27122874--- vim72.orig/src/if_perl.xs   2008-07-17 13:55:09.000000000 -0700
    2713 +++ vim72/src/if_perl.xs        2008-12-30 16:17:28.000000000 -0800
     2875+++ vim72/src/if_perl.xs        2009-01-08 20:57:45.000000000 -0800
    27142876@@ -136,6 +136,9 @@
    27152877 #  define Perl_newXS_flags dll_Perl_newXS_flags
    … …  
    27622924diff -Naur vim72.orig/src/if_python.c vim72/src/if_python.c
    27632925--- vim72.orig/src/if_python.c  2008-07-17 14:09:32.000000000 -0700
    2764 +++ vim72/src/if_python.c       2008-12-30 16:16:31.000000000 -0800
     2926+++ vim72/src/if_python.c       2009-01-08 20:57:39.000000000 -0800
    27652927@@ -531,6 +531,12 @@
    27662928        if (PythonMod_Init())
    … …  
    27882950diff -Naur vim72.orig/src/if_xcmdsrv.c vim72/src/if_xcmdsrv.c
    27892951--- vim72.orig/src/if_xcmdsrv.c 2008-07-18 06:05:03.000000000 -0700
    2790 +++ vim72/src/if_xcmdsrv.c      2008-12-30 16:16:09.000000000 -0800
     2952+++ vim72/src/if_xcmdsrv.c      2009-01-08 20:57:36.000000000 -0800
    27912953@@ -736,7 +736,7 @@
    27922954                + serverReply.ga_len;
    … …  
    28182980diff -Naur vim72.orig/src/main.c vim72/src/main.c
    28192981--- vim72.orig/src/main.c       2008-07-24 01:40:56.000000000 -0700
    2820 +++ vim72/src/main.c    2008-12-30 16:17:03.000000000 -0800
     2982+++ vim72/src/main.c    2009-01-08 20:57:44.000000000 -0800
    28212983@@ -645,11 +645,12 @@
    28222984 
    … …  
    28803042diff -Naur vim72.orig/src/mark.c vim72/src/mark.c
    28813043--- vim72.orig/src/mark.c       2008-08-08 15:06:49.000000000 -0700
    2882 +++ vim72/src/mark.c    2008-12-30 16:15:47.000000000 -0800
     3044+++ vim72/src/mark.c    2009-01-08 20:57:32.000000000 -0800
    28833045@@ -1627,15 +1627,17 @@
    28843046 
    … …  
    29493111diff -Naur vim72.orig/src/mbyte.c vim72/src/mbyte.c
    29503112--- vim72.orig/src/mbyte.c      2008-07-14 05:38:05.000000000 -0700
    2951 +++ vim72/src/mbyte.c   2008-12-30 16:17:03.000000000 -0800
     3113+++ vim72/src/mbyte.c   2009-01-08 20:57:44.000000000 -0800
    29523114@@ -717,7 +717,7 @@
    29533115                     * where mblen() returns 0 for invalid character.
    … …  
    30313193diff -Naur vim72.orig/src/menu.c vim72/src/menu.c
    30323194--- vim72.orig/src/menu.c       2008-06-21 12:53:43.000000000 -0700
    3033 +++ vim72/src/menu.c    2008-12-30 16:14:07.000000000 -0800
     3195+++ vim72/src/menu.c    2009-01-08 20:57:27.000000000 -0800
    30343196@@ -1120,6 +1120,7 @@
    30353197        parent = menu;
    … …  
    30423204diff -Naur vim72.orig/src/message.c vim72/src/message.c
    30433205--- vim72.orig/src/message.c    2008-07-09 11:24:55.000000000 -0700
    3044 +++ vim72/src/message.c 2008-12-30 16:17:03.000000000 -0800
     3206+++ vim72/src/message.c 2009-01-08 20:57:44.000000000 -0800
    30453207@@ -4585,61 +4585,62 @@
    30463208                        if (remove_trailing_zeroes)
    … …  
    31293291diff -Naur vim72.orig/src/misc1.c vim72/src/misc1.c
    31303292--- vim72.orig/src/misc1.c      2008-07-12 12:20:53.000000000 -0700
    3131 +++ vim72/src/misc1.c   2008-12-30 16:15:47.000000000 -0800
     3293+++ vim72/src/misc1.c   2009-01-08 20:57:32.000000000 -0800
    31323294@@ -3245,9 +3245,9 @@
    31333295 
    … …  
    31443306diff -Naur vim72.orig/src/misc2.c vim72/src/misc2.c
    31453307--- vim72.orig/src/misc2.c      2008-07-23 12:12:56.000000000 -0700
    3146 +++ vim72/src/misc2.c   2008-12-30 16:17:58.000000000 -0800
     3308+++ vim72/src/misc2.c   2009-01-08 20:57:52.000000000 -0800
    31473309@@ -873,7 +873,7 @@
    31483310            /* 3. check for available memory: call mch_avail_mem() */
    … …  
    32153377diff -Naur vim72.orig/src/move.c vim72/src/move.c
    32163378--- vim72.orig/src/move.c       2008-07-12 09:26:47.000000000 -0700
    3217 +++ vim72/src/move.c    2008-12-30 16:16:21.000000000 -0800
     3379+++ vim72/src/move.c    2009-01-08 20:57:39.000000000 -0800
    32183380@@ -280,18 +280,20 @@
    32193381 
    … …  
    32653427diff -Naur vim72.orig/src/netbeans.c vim72/src/netbeans.c
    32663428--- vim72.orig/src/netbeans.c   2008-07-13 09:19:54.000000000 -0700
    3267 +++ vim72/src/netbeans.c        2008-12-30 16:17:03.000000000 -0800
     3429+++ vim72/src/netbeans.c        2009-01-08 20:57:54.000000000 -0800
    32683430@@ -1043,7 +1043,7 @@
    32693431        nbdebug(("EVT: %s", buf));
    … …  
    33013463                nbdebug(("    partial line annotation -- Not Yet Implemented!\n"));
    33023464            }
     3465@@ -2924,44 +2918,26 @@
     3466 }
     3467 
     3468 /*
     3469- * Tell netbeans a file was closed.
     3470+ * Tell netbeans that a file was deleted or wiped out.
     3471  */
     3472     void
     3473-netbeans_file_closed(buf_T *bufp)
     3474+netbeans_file_killed(buf_T *bufp)
     3475 {
     3476     int                bufno = nb_getbufno(bufp);
     3477     nbbuf_T    *nbbuf = nb_get_buf(bufno);
     3478     char       buffer[2*MAXPATHL];
     3479 
     3480-    if (!haveConnection || bufno < 0)
     3481-       return;
     3482-
     3483-    if (!netbeansCloseFile)
     3484-    {
     3485-       nbdebug(("Ignoring file_closed for %s. File was closed from IDE\n",
     3486-                   bufp->b_ffname));
     3487+    if (!haveConnection || bufno == -1)
     3488        return;
     3489-    }
     3490-
     3491-    nbdebug(("netbeans_file_closed:\n"));
     3492-    nbdebug(("    Closing bufno: %d", bufno));
     3493-    if (curbuf != NULL && curbuf != bufp)
     3494-    {
     3495-       nbdebug(("    Curbuf bufno:  %d\n", nb_getbufno(curbuf)));
     3496-    }
     3497-    else if (curbuf == bufp)
     3498-    {
     3499-       nbdebug(("    curbuf == bufp\n"));
     3500-    }
     3501 
     3502-    if (bufno <= 0)
     3503-       return;
     3504+    nbdebug(("netbeans_file_killed:\n"));
     3505+    nbdebug(("    Killing bufno: %d", bufno));
     3506 
     3507     sprintf(buffer, "%d:killed=%d\n", bufno, r_cmdno);
     3508 
     3509     nbdebug(("EVT: %s", buffer));
     3510 
     3511-    nb_send(buffer, "netbeans_file_closed");
     3512+    nb_send(buffer, "netbeans_file_killed");
     3513 
     3514     if (nbbuf != NULL)
     3515        nbbuf->bufp = NULL;
    33033516diff -Naur vim72.orig/src/normal.c vim72/src/normal.c
    33043517--- vim72.orig/src/normal.c     2008-07-31 13:03:08.000000000 -0700
    3305 +++ vim72/src/normal.c  2008-12-30 16:16:40.000000000 -0800
     3518+++ vim72/src/normal.c  2009-01-08 20:57:40.000000000 -0800
    33063519@@ -183,6 +183,8 @@
    33073520 static void    nv_cursorhold __ARGS((cmdarg_T *cap));
    … …  
    34913704diff -Naur vim72.orig/src/ops.c vim72/src/ops.c
    34923705--- vim72.orig/src/ops.c        2008-06-21 13:08:59.000000000 -0700
    3493 +++ vim72/src/ops.c     2008-12-30 16:17:30.000000000 -0800
     3706+++ vim72/src/ops.c     2009-01-08 20:57:45.000000000 -0800
    34943707@@ -2209,12 +2209,15 @@
    34953708     {
    … …  
    35123725diff -Naur vim72.orig/src/option.c vim72/src/option.c
    35133726--- vim72.orig/src/option.c     2008-07-18 06:05:33.000000000 -0700
    3514 +++ vim72/src/option.c  2008-12-30 16:17:58.000000000 -0800
     3727+++ vim72/src/option.c  2009-01-08 20:57:52.000000000 -0800
    35153728@@ -2593,13 +2593,13 @@
    35163729 #ifdef FEAT_VIMINFO
    … …  
    35703783diff -Naur vim72.orig/src/os_unix.c vim72/src/os_unix.c
    35713784--- vim72.orig/src/os_unix.c    2008-08-06 04:01:40.000000000 -0700
    3572 +++ vim72/src/os_unix.c 2008-12-30 16:17:03.000000000 -0800
     3785+++ vim72/src/os_unix.c 2009-01-08 20:57:44.000000000 -0800
    35733786@@ -315,12 +315,15 @@
    35743787     {-1,           "Unknown!", FALSE}
    … …  
    36843897diff -Naur vim72.orig/src/proto/eval.pro vim72/src/proto/eval.pro
    36853898--- vim72.orig/src/proto/eval.pro       2008-08-09 07:31:25.000000000 -0700
    3686 +++ vim72/src/proto/eval.pro    2008-12-30 16:16:40.000000000 -0800
     3899+++ vim72/src/proto/eval.pro    2009-01-08 20:57:40.000000000 -0800
    36873900@@ -17,7 +17,7 @@
    36883901 int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip));
    … …  
    37263939diff -Naur vim72.orig/src/proto/ex_cmds.pro vim72/src/proto/ex_cmds.pro
    37273940--- vim72.orig/src/proto/ex_cmds.pro    2008-08-09 07:31:25.000000000 -0700
    3728 +++ vim72/src/proto/ex_cmds.pro 2008-12-30 16:15:47.000000000 -0800
     3941+++ vim72/src/proto/ex_cmds.pro 2009-01-08 20:57:32.000000000 -0800
    37293942@@ -11,7 +11,7 @@
    37303943 char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
    … …  
    37383951diff -Naur vim72.orig/src/proto/ex_getln.pro vim72/src/proto/ex_getln.pro
    37393952--- vim72.orig/src/proto/ex_getln.pro   2008-08-09 07:31:28.000000000 -0700
    3740 +++ vim72/src/proto/ex_getln.pro        2008-12-30 16:16:50.000000000 -0800
     3953+++ vim72/src/proto/ex_getln.pro        2009-01-08 20:57:43.000000000 -0800
    37413954@@ -31,7 +31,7 @@
    37423955 void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col));
    … …  
    37503963diff -Naur vim72.orig/src/proto/mark.pro vim72/src/proto/mark.pro
    37513964--- vim72.orig/src/proto/mark.pro       2008-08-09 07:31:36.000000000 -0700
    3752 +++ vim72/src/proto/mark.pro    2008-12-30 16:15:47.000000000 -0800
     3965+++ vim72/src/proto/mark.pro    2009-01-08 20:57:32.000000000 -0800
    37533966@@ -26,5 +26,5 @@
    37543967 void write_viminfo_filemarks __ARGS((FILE *fp));
    … …  
    37603973diff -Naur vim72.orig/src/proto/misc2.pro vim72/src/proto/misc2.pro
    37613974--- vim72.orig/src/proto/misc2.pro      2008-08-09 07:31:40.000000000 -0700
    3762 +++ vim72/src/proto/misc2.pro   2008-12-30 16:17:58.000000000 -0800
     3975+++ vim72/src/proto/misc2.pro   2009-01-08 20:57:52.000000000 -0800
    37633976@@ -59,7 +59,7 @@
    37643977 int handle_x_keys __ARGS((int key));
    … …  
    37703983 int find_special_key_in_table __ARGS((int c));
    37713984 int get_special_key_code __ARGS((char_u *name));
     3985diff -Naur vim72.orig/src/proto/netbeans.pro vim72/src/proto/netbeans.pro
     3986--- vim72.orig/src/proto/netbeans.pro   2008-08-09 07:31:56.000000000 -0700
     3987+++ vim72/src/proto/netbeans.pro        2009-01-08 20:57:54.000000000 -0800
     3988@@ -11,7 +11,7 @@
     3989 void netbeans_frame_moved __ARGS((int new_x, int new_y));
     3990 void netbeans_file_activated __ARGS((buf_T *bufp));
     3991 void netbeans_file_opened __ARGS((buf_T *bufp));
     3992-void netbeans_file_closed __ARGS((buf_T *bufp));
     3993+void netbeans_file_killed __ARGS((buf_T *bufp));
     3994 void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen));
     3995 void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len));
     3996 void netbeans_unmodified __ARGS((buf_T *bufp));
    37723997diff -Naur vim72.orig/src/pty.c vim72/src/pty.c
    37733998--- vim72.orig/src/pty.c        2008-06-21 11:52:58.000000000 -0700
    3774 +++ vim72/src/pty.c     2008-12-30 16:14:03.000000000 -0800
     3999+++ vim72/src/pty.c     2009-01-08 20:57:27.000000000 -0800
    37754000@@ -270,9 +270,10 @@
    37764001 }
    … …  
    37884013diff -Naur vim72.orig/src/screen.c vim72/src/screen.c
    37894014--- vim72.orig/src/screen.c     2008-07-24 07:45:07.000000000 -0700
    3790 +++ vim72/src/screen.c  2008-12-30 16:15:21.000000000 -0800
     4015+++ vim72/src/screen.c  2009-01-08 20:57:31.000000000 -0800
    37914016@@ -2439,9 +2439,17 @@
    37924017 
    … …  
    38124037diff -Naur vim72.orig/src/spell.c vim72/src/spell.c
    38134038--- vim72.orig/src/spell.c      2008-07-12 12:20:55.000000000 -0700
    3814 +++ vim72/src/spell.c   2008-12-30 16:17:46.000000000 -0800
     4039+++ vim72/src/spell.c   2009-01-08 20:57:46.000000000 -0800
    38154040@@ -77,7 +77,7 @@
    38164041 
    … …  
    46474872diff -Naur vim72.orig/src/structs.h vim72/src/structs.h
    46484873--- vim72.orig/src/structs.h    2008-07-30 13:02:50.000000000 -0700
    4649 +++ vim72/src/structs.h 2008-12-30 16:16:21.000000000 -0800
     4874+++ vim72/src/structs.h 2009-01-08 20:57:39.000000000 -0800
    46504875@@ -459,7 +459,7 @@
    46514876 typedef struct
    … …  
    46764901diff -Naur vim72.orig/src/tag.c vim72/src/tag.c
    46774902--- vim72.orig/src/tag.c        2008-07-16 14:31:30.000000000 -0700
    4678 +++ vim72/src/tag.c     2008-12-30 16:17:42.000000000 -0800
     4903+++ vim72/src/tag.c     2009-01-08 20:57:45.000000000 -0800
    46794904@@ -2725,7 +2725,24 @@
    46804905         */
    … …  
    47224947diff -Naur vim72.orig/src/testdir/Make_ming.mak vim72/src/testdir/Make_ming.mak
    47234948--- vim72.orig/src/testdir/Make_ming.mak        1969-12-31 16:00:00.000000000 -0800
    4724 +++ vim72/src/testdir/Make_ming.mak     2008-12-30 16:15:18.000000000 -0800
     4949+++ vim72/src/testdir/Make_ming.mak     2009-01-08 20:57:31.000000000 -0800
    47254950@@ -0,0 +1,91 @@
    47264951+# Makefile to run tests for Vim, on Dos-like machines
    … …  
    48175042diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile
    48185043--- vim72.orig/src/testdir/Makefile     2008-06-19 13:29:46.000000000 -0700
    4819 +++ vim72/src/testdir/Makefile  2008-12-30 16:14:55.000000000 -0800
     5044+++ vim72/src/testdir/Makefile  2009-01-08 20:57:31.000000000 -0800
    48205045@@ -26,15 +26,17 @@
    48215046 
    … …  
    48515076diff -Naur vim72.orig/src/testdir/test42.ok vim72/src/testdir/test42.ok
    48525077--- vim72.orig/src/testdir/test42.ok    2008-02-20 04:27:37.000000000 -0800
    4853 +++ vim72/src/testdir/test42.ok 2008-12-30 16:15:53.000000000 -0800
     5078+++ vim72/src/testdir/test42.ok 2009-01-08 20:57:32.000000000 -0800
    48545079@@ -20,7 +20,7 @@
    48555080 ucs-2
    … …  
    48635088diff -Naur vim72.orig/src/ui.c vim72/src/ui.c
    48645089--- vim72.orig/src/ui.c 2008-07-14 11:14:56.000000000 -0700
    4865 +++ vim72/src/ui.c      2008-12-30 16:17:03.000000000 -0800
     5090+++ vim72/src/ui.c      2009-01-08 20:57:44.000000000 -0800
    48665091@@ -1820,7 +1820,7 @@
    48675092 #ifdef HAVE_DUP
    … …  
    49715196diff -Naur vim72.orig/src/version.c vim72/src/version.c
    49725197--- vim72.orig/src/version.c    2008-08-09 07:24:52.000000000 -0700
    4973 +++ vim72/src/version.c 2008-12-30 16:18:07.000000000 -0800
    4974 @@ -677,9 +677,160 @@
     5198+++ vim72/src/version.c 2009-01-08 20:57:54.000000000 -0800
     5199@@ -677,9 +677,166 @@
    49755200 static int included_patches[] =
    49765201 {   /* Add new patch number below this line */
    49775202 /**/
     5203+    79,
     5204+/**/
     5205+    78,
     5206+/**/
     5207+    77,
     5208+/**/
    49785209+    76,
    49795210+/**/
    … …  
    51335364 highest_patch()
    51345365 {
    5135 @@ -786,7 +937,7 @@
     5366@@ -786,7 +943,7 @@
    51365367     MSG_PUTS(_("\nRISC OS version"));
    51375368 #endif
    … …  
    51425373     if (*compiled_arch != NUL)
    51435374     {
    5144 @@ -825,6 +976,19 @@
     5375@@ -825,6 +982,19 @@
    51455376        }
    51465377     }
    … …  
    51645395diff -Naur vim72.orig/src/vim.h vim72/src/vim.h
    51655396--- vim72.orig/src/vim.h        2008-08-09 09:03:38.000000000 -0700
    5166 +++ vim72/src/vim.h     2008-12-30 16:16:37.000000000 -0800
     5397+++ vim72/src/vim.h     2009-01-08 20:57:39.000000000 -0800
    51675398@@ -341,8 +341,14 @@
    51685399 #ifdef BACKSLASH_IN_FILENAME
    … …  
    52245455diff -Naur vim72.orig/src/window.c vim72/src/window.c
    52255456--- vim72.orig/src/window.c     2008-08-06 04:00:30.000000000 -0700
    5226 +++ vim72/src/window.c  2008-12-30 16:17:03.000000000 -0800
     5457+++ vim72/src/window.c  2009-01-08 20:57:44.000000000 -0800
    52275458@@ -4028,14 +4028,14 @@
    52285459            if (mch_dirname(cwd, MAXPATHL) == OK)
    … …  
    52455476diff -Naur vim72.orig/src/workshop.c vim72/src/workshop.c
    52465477--- vim72.orig/src/workshop.c   2008-06-21 11:53:26.000000000 -0700
    5247 +++ vim72/src/workshop.c        2008-12-30 16:16:56.000000000 -0800
     5478+++ vim72/src/workshop.c        2009-01-08 20:57:43.000000000 -0800
    52485479@@ -1121,8 +1121,12 @@
    52495480                                      ? (char *)curbuf->b_sfname : "<None>");
Note: See TracChangeset for help on using the changeset viewer.