Changeset 61a83e8

Timestamp:

Feb 15, 2009, 11:31:33 PM (15 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:

c7ef534

Parents:

8652612

Message:

Updated Vim Branch Update Patch to -8.

Files:

• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/vim-7.2-branch_update-8.patch (moved) (moved from patches/vim-7.2-branch_update-7.patch) (120 diffs)

BOOK/introduction/common/changelog.xml

@@ -42 +42 @@
         <listitem>
           <para>[Jim] - Updated Ncurses Branch Update Patch to -8.</para>
+        </listitem>
+        <listitem>
+          <para>[Jim] - Updated Vim Branch Update Patch to -8.</para>
         </listitem>
       </itemizedlist>

BOOK/patches.ent

@@ -121 +121 @@
 <!ENTITY tar-revert_pipe_drain-patch-size "4 KB">
 
-<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-7.patch">
-<!ENTITY vim-branch_update-patch-md5 "2296ce9262b79c6fa8e8834ff1f6d554">
-<!ENTITY vim-branch_update-patch-size "192 KB">
+<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-8.patch">
+<!ENTITY vim-branch_update-patch-md5 "6a672a4dbc1aeeb6326e80123ffcfa4c">
+<!ENTITY vim-branch_update-patch-size "196 KB">
 
 <!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">

patches/vim-7.2-branch_update-8.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 02-07-2009
+Date: 02-15-2009
 Initial Package Version: 7.2
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 7.2.102
+Description: Contains all upstream patches up to 7.2.108
              The following patches were skipped
              007 036 041 049 071 072 074 088 089 093 101
@@ -10 +10 @@
 diff -Naur vim72.orig/Filelist vim72/Filelist
 --- vim72.orig/Filelist 2008-07-06 11:02:23.000000000 -0700
-+++ vim72/Filelist      2009-02-07 22:14:24.920315687 -0800
++++ vim72/Filelist      2009-02-15 23:26:03.078324067 -0800
 @@ -285,6 +285,7 @@
                 src/proto/os_win32.pro \
@@ -21 +21 @@
 diff -Naur vim72.orig/runtime/doc/cmdline.txt vim72/runtime/doc/cmdline.txt
 --- vim72.orig/runtime/doc/cmdline.txt  2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/cmdline.txt       2009-02-07 22:14:49.082537505 -0800
++++ vim72/runtime/doc/cmdline.txt       2009-02-15 23:26:29.516017600 -0800
 @@ -1,4 +1,4 @@
 -*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
 --- vim72.orig/runtime/doc/eval.txt     2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/eval.txt  2009-02-07 22:16:31.313639335 -0800
++++ vim72/runtime/doc/eval.txt  2009-02-15 23:28:13.518683894 -0800
 @@ -1,4 +1,4 @@
 -*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
 --- vim72.orig/runtime/doc/netbeans.txt 2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/netbeans.txt      2009-02-07 22:17:10.442415701 -0800
++++ vim72/runtime/doc/netbeans.txt      2009-02-15 23:28:48.044895935 -0800
 @@ -1,4 +1,4 @@
 -*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
 --- vim72.orig/runtime/doc/options.txt  2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/options.txt       2009-02-07 22:15:46.012035201 -0800
++++ vim72/runtime/doc/options.txt       2009-02-15 23:27:23.659489593 -0800
 @@ -1,4 +1,4 @@
 -*options.txt*  For Vim version 7.2.  Last change: 2008 Aug 06
@@ -242 +242 @@
 diff -Naur vim72.orig/runtime/doc/spell.txt vim72/runtime/doc/spell.txt
 --- vim72.orig/runtime/doc/spell.txt    2008-08-09 07:23:00.000000000 -0700
-+++ vim72/runtime/doc/spell.txt 2009-02-07 22:16:14.222486660 -0800
++++ vim72/runtime/doc/spell.txt 2009-02-15 23:27:49.861165805 -0800
 @@ -1,4 +1,4 @@
 -*spell.txt*    For Vim version 7.2.  Last change: 2008 Jun 21
@@ -372 +372 @@
 diff -Naur vim72.orig/runtime/doc/starting.txt vim72/runtime/doc/starting.txt
 --- vim72.orig/runtime/doc/starting.txt 2008-08-09 07:23:00.000000000 -0700
-+++ vim72/runtime/doc/starting.txt      2009-02-07 22:14:49.086641151 -0800
++++ vim72/runtime/doc/starting.txt      2009-02-15 23:26:29.520020393 -0800
 @@ -1,4 +1,4 @@
 -*starting.txt*  For Vim version 7.2.  Last change: 2008 Jun 21
@@ -434 +434 @@
 diff -Naur vim72.orig/runtime/doc/usr_21.txt vim72/runtime/doc/usr_21.txt
 --- vim72.orig/runtime/doc/usr_21.txt   2008-08-09 07:23:01.000000000 -0700
-+++ vim72/runtime/doc/usr_21.txt        2009-02-07 22:14:49.086641151 -0800
++++ vim72/runtime/doc/usr_21.txt        2009-02-15 23:26:29.520020393 -0800
 @@ -1,4 +1,4 @@
 -*usr_21.txt*   For Vim version 7.2.  Last change: 2007 May 01
@@ -501 +501 @@
 diff -Naur vim72.orig/runtime/scripts.vim vim72/runtime/scripts.vim
 --- vim72.orig/runtime/scripts.vim      2008-08-08 15:27:21.000000000 -0700
-+++ vim72/runtime/scripts.vim   2009-02-07 22:13:32.395881827 -0800
++++ vim72/runtime/scripts.vim   2009-02-15 23:25:14.879235088 -0800
 @@ -234,6 +234,10 @@
    elseif s:line1 =~ '\<DTD\s\+XHTML\s'
@@ -515 +515 @@
 diff -Naur vim72.orig/src/auto/configure vim72/src/auto/configure
 --- vim72.orig/src/auto/configure       2008-07-24 05:40:36.000000000 -0700
-+++ vim72/src/auto/configure    2009-02-07 22:15:25.364839224 -0800
++++ vim72/src/auto/configure    2009-02-15 23:27:04.022228523 -0800
 @@ -16819,21 +16819,29 @@
    LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
@@ -556 +556 @@
 diff -Naur vim72.orig/src/buffer.c vim72/src/buffer.c
 --- vim72.orig/src/buffer.c     2008-08-06 04:00:48.000000000 -0700
-+++ vim72/src/buffer.c  2009-02-07 22:17:10.446515715 -0800
++++ vim72/src/buffer.c  2009-02-15 23:28:48.044895935 -0800
 @@ -437,10 +437,6 @@
         return;
@@ -674 +674 @@
 diff -Naur vim72.orig/src/configure.in vim72/src/configure.in
 --- vim72.orig/src/configure.in 2008-07-24 05:40:26.000000000 -0700
-+++ vim72/src/configure.in      2009-02-07 22:15:25.364839224 -0800
++++ vim72/src/configure.in      2009-02-15 23:27:04.022228523 -0800
 @@ -3152,18 +3152,25 @@
  dnl But only when making dependencies, cproto and lint don't take "-isystem".
@@ -709 +709 @@
 diff -Naur vim72.orig/src/diff.c vim72/src/diff.c
 --- vim72.orig/src/diff.c       2008-03-05 03:16:56.000000000 -0800
-+++ vim72/src/diff.c    2009-02-07 22:17:31.848396425 -0800
++++ vim72/src/diff.c    2009-02-15 23:29:07.186120966 -0800
 @@ -8,7 +8,7 @@
   */
@@ -835 +835 @@
 diff -Naur vim72.orig/src/edit.c vim72/src/edit.c
 --- vim72.orig/src/edit.c       2008-08-06 05:51:17.000000000 -0700
-+++ vim72/src/edit.c    2009-02-07 22:17:53.553792150 -0800
++++ vim72/src/edit.c    2009-02-15 23:29:31.179660846 -0800
 @@ -147,6 +147,7 @@
  static int  ins_compl_bs __ARGS((void));
@@ -1075 +1075 @@
 diff -Naur vim72.orig/src/eval.c vim72/src/eval.c
 --- vim72.orig/src/eval.c       2008-08-07 12:37:22.000000000 -0700
-+++ vim72/src/eval.c    2009-02-07 22:18:04.431097639 -0800
++++ vim72/src/eval.c    2009-02-15 23:29:43.448444754 -0800
 @@ -32,6 +32,9 @@
  
@@ -1964 +1964 @@
 diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c
 --- vim72.orig/src/ex_cmds2.c   2008-07-13 09:18:22.000000000 -0700
-+++ vim72/src/ex_cmds2.c        2009-02-07 22:18:15.152545887 -0800
++++ vim72/src/ex_cmds2.c        2009-02-15 23:29:53.533092890 -0800
 @@ -2842,6 +2842,7 @@
      linenr_T               save_sourcing_lnum;
@@ -2057 +2057 @@
 diff -Naur vim72.orig/src/ex_cmds.c vim72/src/ex_cmds.c
 --- vim72.orig/src/ex_cmds.c    2008-08-04 12:15:00.000000000 -0700
-+++ vim72/src/ex_cmds.c 2009-02-07 22:17:58.717640174 -0800
++++ vim72/src/ex_cmds.c 2009-02-15 23:29:58.597415281 -0800
 @@ -24,7 +24,7 @@
  static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out));
@@ -2214 +2214 @@
  
  /*
-@@ -5059,6 +5062,7 @@
+@@ -2704,7 +2707,12 @@
+        if (eap->cmdidx == CMD_saveas)
+        {
+            if (retval == OK)
++           {
+                curbuf->b_p_ro = FALSE;
++#ifdef FEAT_WINDOWS
++               redraw_tabline = TRUE;
++#endif
++           }
+            /* Change directories when the 'acd' option is set. */
+            DO_AUTOCHDIR
+        }
+@@ -5059,6 +5067,7 @@
  
             if (did_sub)
@@ -2224 +2237 @@
 diff -Naur vim72.orig/src/ex_cmds.h vim72/src/ex_cmds.h
 --- vim72.orig/src/ex_cmds.h    2008-06-21 11:47:57.000000000 -0700
-+++ vim72/src/ex_cmds.h 2009-02-07 22:14:49.094844532 -0800
++++ vim72/src/ex_cmds.h 2009-02-15 23:26:29.532020952 -0800
 @@ -278,7 +278,7 @@
  EX(CMD_crewind,                "crewind",      ex_cc,
@@ -2272 +2285 @@
 diff -Naur vim72.orig/src/ex_docmd.c vim72/src/ex_docmd.c
 --- vim72.orig/src/ex_docmd.c   2008-07-26 04:51:05.000000000 -0700
-+++ vim72/src/ex_docmd.c        2009-02-07 22:17:42.541134237 -0800
++++ vim72/src/ex_docmd.c        2009-02-15 23:29:17.390774968 -0800
 @@ -364,6 +364,7 @@
  # define ex_function           ex_ni
@@ -2489 +2502 @@
 diff -Naur vim72.orig/src/ex_getln.c vim72/src/ex_getln.c
 --- vim72.orig/src/ex_getln.c   2008-08-08 02:31:33.000000000 -0700
-+++ vim72/src/ex_getln.c        2009-02-07 22:15:46.007933510 -0800
++++ vim72/src/ex_getln.c        2009-02-15 23:27:23.655489034 -0800
 @@ -31,6 +31,8 @@
      int                cmdattr;        /* attributes for prompt */
@@ -2623 +2636 @@
 diff -Naur vim72.orig/src/feature.h vim72/src/feature.h
 --- vim72.orig/src/feature.h    2008-08-06 04:00:39.000000000 -0700
-+++ vim72/src/feature.h 2009-02-07 22:14:49.098945384 -0800
++++ vim72/src/feature.h 2009-02-15 23:26:29.532020952 -0800
 @@ -767,9 +767,13 @@
  
@@ -2642 +2655 @@
 diff -Naur vim72.orig/src/fileio.c vim72/src/fileio.c
 --- vim72.orig/src/fileio.c     2008-08-06 04:01:03.000000000 -0700
-+++ vim72/src/fileio.c  2009-02-07 22:17:04.228567398 -0800
++++ vim72/src/fileio.c  2009-02-15 23:28:42.524542813 -0800
 @@ -932,7 +932,10 @@
      else
@@ -2872 +2885 @@
 diff -Naur vim72.orig/src/fold.c vim72/src/fold.c
 --- vim72.orig/src/fold.c       2008-08-06 04:01:12.000000000 -0700
-+++ vim72/src/fold.c    2009-02-07 22:17:06.755120268 -0800
++++ vim72/src/fold.c    2009-02-15 23:28:45.352722167 -0800
 @@ -48,7 +48,7 @@
  static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));
@@ -2961 +2974 @@
 diff -Naur vim72.orig/src/getchar.c vim72/src/getchar.c
 --- vim72.orig/src/getchar.c    2008-07-22 09:57:48.000000000 -0700
-+++ vim72/src/getchar.c 2009-02-07 22:15:56.893443498 -0800
++++ vim72/src/getchar.c 2009-02-15 23:27:32.644064534 -0800
 @@ -4702,7 +4702,7 @@
                         return FAIL;
@@ -2982 +2995 @@
 diff -Naur vim72.orig/src/globals.h vim72/src/globals.h
 --- vim72.orig/src/globals.h    2008-07-26 04:53:29.000000000 -0700
-+++ vim72/src/globals.h 2009-02-07 22:17:10.446515715 -0800
++++ vim72/src/globals.h 2009-02-15 23:28:48.044895935 -0800
 @@ -1022,6 +1022,7 @@
  #endif
@@ -3016 +3029 @@
 diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c
 --- vim72.orig/src/gui_at_sb.c  2004-06-07 07:32:25.000000000 -0700
-+++ vim72/src/gui_at_sb.c       2009-02-07 22:16:00.129565861 -0800
++++ vim72/src/gui_at_sb.c       2009-02-15 23:27:36.144289425 -0800
 @@ -1078,6 +1078,12 @@
      Cardinal   *num_params;    /* unused */
@@ -3042 +3055 @@
 diff -Naur vim72.orig/src/gui.c vim72/src/gui.c
 --- vim72.orig/src/gui.c        2008-07-27 12:32:14.000000000 -0700
-+++ vim72/src/gui.c     2009-02-07 22:16:28.052906831 -0800
++++ vim72/src/gui.c     2009-02-15 23:28:10.986519625 -0800
 @@ -139,7 +139,7 @@
                 /* The read returns when the child closes the pipe (or when
@@ -3135 +3148 @@
 diff -Naur vim72.orig/src/gui_gtk_x11.c vim72/src/gui_gtk_x11.c
 --- vim72.orig/src/gui_gtk_x11.c        2008-07-04 03:46:24.000000000 -0700
-+++ vim72/src/gui_gtk_x11.c     2009-02-07 22:16:00.133666993 -0800
++++ vim72/src/gui_gtk_x11.c     2009-02-15 23:27:36.148289425 -0800
 @@ -4070,14 +4070,14 @@
  
@@ -3159 +3172 @@
 diff -Naur vim72.orig/src/gui_x11.c vim72/src/gui_x11.c
 --- vim72.orig/src/gui_x11.c    2008-06-08 08:13:45.000000000 -0700
-+++ vim72/src/gui_x11.c 2009-02-07 22:15:00.616092472 -0800
++++ vim72/src/gui_x11.c 2009-02-15 23:26:39.688669925 -0800
 @@ -2450,7 +2450,7 @@
         *colorPtr = colortable[closest];
@@ -3171 +3184 @@
 diff -Naur vim72.orig/src/gui_xmdlg.c vim72/src/gui_xmdlg.c
 --- vim72.orig/src/gui_xmdlg.c  2008-06-21 09:05:32.000000000 -0700
-+++ vim72/src/gui_xmdlg.c       2009-02-07 22:16:00.133666993 -0800
++++ vim72/src/gui_xmdlg.c       2009-02-15 23:27:36.148289425 -0800
 @@ -369,10 +369,10 @@
      char       buf[TEMP_BUF_SIZE];
@@ -3327 +3340 @@
 diff -Naur vim72.orig/src/gui_xmebw.c vim72/src/gui_xmebw.c
 --- vim72.orig/src/gui_xmebw.c  2007-09-06 03:57:51.000000000 -0700
-+++ vim72/src/gui_xmebw.c       2009-02-07 22:16:00.133666993 -0800
++++ vim72/src/gui_xmebw.c       2009-02-15 23:27:36.148289425 -0800
 @@ -1256,7 +1256,7 @@
      }
@@ -3354 +3367 @@
 diff -Naur vim72.orig/src/if_cscope.c vim72/src/if_cscope.c
 --- vim72.orig/src/if_cscope.c  2008-06-24 09:32:34.000000000 -0700
-+++ vim72/src/if_cscope.c       2009-02-07 22:17:45.055382037 -0800
++++ vim72/src/if_cscope.c       2009-02-15 23:29:20.378966335 -0800
 @@ -74,7 +74,7 @@
      { "add",   cs_add,
@@ -3397 +3410 @@
 diff -Naur vim72.orig/src/if_cscope.h vim72/src/if_cscope.h
 --- vim72.orig/src/if_cscope.h  2007-09-02 07:51:08.000000000 -0700
-+++ vim72/src/if_cscope.h       2009-02-07 22:13:26.206645342 -0800
++++ vim72/src/if_cscope.h       2009-02-15 23:25:07.934792289 -0800
 @@ -42,17 +42,6 @@
   * f 7name     Find this file
@@ -3418 +3431 @@
 diff -Naur vim72.orig/src/if_perl.xs vim72/src/if_perl.xs
 --- vim72.orig/src/if_perl.xs   2008-07-17 13:55:09.000000000 -0700
-+++ vim72/src/if_perl.xs        2009-02-07 22:16:22.052343345 -0800
++++ vim72/src/if_perl.xs        2009-02-15 23:28:02.421970945 -0800
 @@ -136,6 +136,9 @@
  #  define Perl_newXS_flags dll_Perl_newXS_flags
@@ -3469 +3482 @@
 diff -Naur vim72.orig/src/if_python.c vim72/src/if_python.c
 --- vim72.orig/src/if_python.c  2008-07-17 14:09:32.000000000 -0700
-+++ vim72/src/if_python.c       2009-02-07 22:17:23.579673139 -0800
++++ vim72/src/if_python.c       2009-02-15 23:29:02.149800251 -0800
 @@ -531,6 +531,12 @@
         if (PythonMod_Init())
@@ -3571 +3584 @@
 diff -Naur vim72.orig/src/if_xcmdsrv.c vim72/src/if_xcmdsrv.c
 --- vim72.orig/src/if_xcmdsrv.c 2008-07-18 06:05:03.000000000 -0700
-+++ vim72/src/if_xcmdsrv.c      2009-02-07 22:15:09.294969689 -0800
++++ vim72/src/if_xcmdsrv.c      2009-02-15 23:26:47.873194300 -0800
 @@ -736,7 +736,7 @@
                 + serverReply.ga_len;
@@ -3601 +3614 @@
 diff -Naur vim72.orig/src/main.c vim72/src/main.c
 --- vim72.orig/src/main.c       2008-07-24 01:40:56.000000000 -0700
-+++ vim72/src/main.c    2009-02-07 22:16:00.133666993 -0800
++++ vim72/src/main.c    2009-02-15 23:27:36.148289425 -0800
 @@ -645,11 +645,12 @@
  
@@ -3663 +3676 @@
 diff -Naur vim72.orig/src/mark.c vim72/src/mark.c
 --- vim72.orig/src/mark.c       2008-08-08 15:06:49.000000000 -0700
-+++ vim72/src/mark.c    2009-02-07 22:14:49.103047074 -0800
++++ vim72/src/mark.c    2009-02-15 23:26:29.540021232 -0800
 @@ -1627,15 +1627,17 @@
  
@@ -3732 +3745 @@
 diff -Naur vim72.orig/src/mbyte.c vim72/src/mbyte.c
 --- vim72.orig/src/mbyte.c      2008-07-14 05:38:05.000000000 -0700
-+++ vim72/src/mbyte.c   2009-02-07 22:16:00.137768683 -0800
++++ vim72/src/mbyte.c   2009-02-15 23:27:36.152289705 -0800
 @@ -717,7 +717,7 @@
                      * where mblen() returns 0 for invalid character.
@@ -3814 +3827 @@
 diff -Naur vim72.orig/src/menu.c vim72/src/menu.c
 --- vim72.orig/src/menu.c       2008-06-21 12:53:43.000000000 -0700
-+++ vim72/src/menu.c    2009-02-07 22:13:20.029714486 -0800
++++ vim72/src/menu.c    2009-02-15 23:25:01.126353959 -0800
 @@ -1120,6 +1120,7 @@
         parent = menu;
@@ -3825 +3838 @@
 diff -Naur vim72.orig/src/message.c vim72/src/message.c
 --- vim72.orig/src/message.c    2008-07-09 11:24:55.000000000 -0700
-+++ vim72/src/message.c 2009-02-07 22:17:15.799035061 -0800
-@@ -4556,7 +4556,13 @@
++++ vim72/src/message.c 2009-02-15 23:30:06.305911160 -0800
+@@ -3309,7 +3309,10 @@
+     {
+        c = gui_mch_dialog(type, title, message, buttons, dfltbutton,
+                                                                   textfield);
+-       msg_end_prompt();
++       /* avoid a hit-enter prompt without clearing the cmdline */
++       need_wait_return = FALSE;
++       emsg_on_display = FALSE;
++       cmdline_row = msg_row;
+ 
+        /* Flush output to avoid that further messages and redrawing is done
+         * in the wrong order. */
+@@ -4556,7 +4559,13 @@
                         remove_trailing_zeroes = TRUE;
                     }
@@ -3841 +3866 @@
                         /* Avoid a buffer overflow */
                         strcpy(tmp, "inf");
-@@ -4585,61 +4591,62 @@
+@@ -4585,61 +4594,62 @@
                         if (remove_trailing_zeroes)
                         {
@@ -3927 +3952 @@
 diff -Naur vim72.orig/src/misc1.c vim72/src/misc1.c
 --- vim72.orig/src/misc1.c      2008-07-12 12:20:53.000000000 -0700
-+++ vim72/src/misc1.c   2009-02-07 22:14:49.107148764 -0800
++++ vim72/src/misc1.c   2009-02-15 23:26:29.540021232 -0800
 @@ -3245,9 +3245,9 @@
  
@@ -3942 +3967 @@
 diff -Naur vim72.orig/src/misc2.c vim72/src/misc2.c
 --- vim72.orig/src/misc2.c      2008-07-23 12:12:56.000000000 -0700
-+++ vim72/src/misc2.c   2009-02-07 22:17:34.370847325 -0800
++++ vim72/src/misc2.c   2009-02-15 23:29:09.750285235 -0800
 @@ -873,7 +873,7 @@
             /* 3. check for available memory: call mch_avail_mem() */
@@ -4023 +4048 @@
 diff -Naur vim72.orig/src/move.c vim72/src/move.c
 --- vim72.orig/src/move.c       2008-07-12 09:26:47.000000000 -0700
-+++ vim72/src/move.c    2009-02-07 22:15:20.110754575 -0800
++++ vim72/src/move.c    2009-02-15 23:26:58.897901382 -0800
 @@ -280,18 +280,20 @@
  
@@ -4073 +4098 @@
 diff -Naur vim72.orig/src/netbeans.c vim72/src/netbeans.c
 --- vim72.orig/src/netbeans.c   2008-07-13 09:19:54.000000000 -0700
-+++ vim72/src/netbeans.c        2009-02-07 22:17:10.446515715 -0800
++++ vim72/src/netbeans.c        2009-02-15 23:28:48.048896773 -0800
 @@ -1043,7 +1043,7 @@
         nbdebug(("EVT: %s", buf));
@@ -4162 +4187 @@
 diff -Naur vim72.orig/src/normal.c vim72/src/normal.c
 --- vim72.orig/src/normal.c     2008-07-31 13:03:08.000000000 -0700
-+++ vim72/src/normal.c  2009-02-07 22:17:56.080346418 -0800
++++ vim72/src/normal.c  2009-02-15 23:29:35.431930716 -0800
 @@ -183,6 +183,8 @@
  static void    nv_cursorhold __ARGS((cmdarg_T *cap));
@@ -4368 +4393 @@
 diff -Naur vim72.orig/src/ops.c vim72/src/ops.c
 --- vim72.orig/src/ops.c        2008-06-21 13:08:59.000000000 -0700
-+++ vim72/src/ops.c     2009-02-07 22:16:25.009559715 -0800
++++ vim72/src/ops.c     2009-02-15 23:28:04.942134376 -0800
 @@ -2209,12 +2209,15 @@
      {
@@ -4389 +4414 @@
 diff -Naur vim72.orig/src/option.c vim72/src/option.c
 --- vim72.orig/src/option.c     2008-07-18 06:05:33.000000000 -0700
-+++ vim72/src/option.c  2009-02-07 22:18:06.941245984 -0800
++++ vim72/src/option.c  2009-02-15 23:30:11.834265120 -0800
 @@ -2593,13 +2593,13 @@
  #ifdef FEAT_VIMINFO
@@ -4407 +4432 @@
  #endif
  #else
-@@ -5407,6 +5407,10 @@
+@@ -4119,11 +4119,23 @@
+                                           && options[opt_idx].var == VAR_WIN)
+                goto skip;
+ 
+-           /* Disallow changing some options from modelines */
+-           if ((opt_flags & OPT_MODELINE) && (flags & P_SECURE))
++           /* Disallow changing some options from modelines. */
++           if (opt_flags & OPT_MODELINE)
+            {
+-               errmsg = (char_u *)_("E520: Not allowed in a modeline");
+-               goto skip;
++               if (flags & P_SECURE)
++               {
++                   errmsg = (char_u *)_("E520: Not allowed in a modeline");
++                   goto skip;
++               }
++#ifdef FEAT_DIFF
++               /* In diff mode some options are overruled.  This avoids that
++                * 'foldmethod' becomes "marker" instead of "diff" and that
++                * "wrap" gets set. */
++               if (curwin->w_p_diff
++                       && (options[opt_idx].indir == PV_FDM
++                           || options[opt_idx].indir == PV_WRAP))
++                   goto skip;
++#endif
+            }
+ 
+ #ifdef HAVE_SANDBOX
+@@ -5268,6 +5280,21 @@
+ }
+ #endif
+ 
++#ifdef FEAT_TITLE
++static void redraw_titles __ARGS((void));
++
++/*
++ * Redraw the window title and/or tab page text later.
++ */
++static void redraw_titles()
++{
++    need_maketitle = TRUE;
++# ifdef FEAT_WINDOWS
++    redraw_tabline = TRUE;
++# endif
++}
++#endif
++
+ /*
+  * Set a string option to a new value (without checking the effect).
+  * The string is copied into allocated memory.
+@@ -5407,6 +5434,10 @@
      int                did_chartab = FALSE;
      char_u     **gvarp;
@@ -4418 +4493 @@
      /* Get the global option to compare with, otherwise we would have to check
       * two values for all local options. */
-@@ -6055,6 +6059,7 @@
+@@ -5668,7 +5699,7 @@
+            {
+ # ifdef FEAT_TITLE
+                /* May show a "+" in the title now. */
+-               need_maketitle = TRUE;
++               redraw_titles();
+ # endif
+                /* Add 'fileencoding' to the swap file. */
+                ml_setflags(curbuf);
+@@ -5687,7 +5718,7 @@
+            {
+                errmsg = mb_init();
+ # ifdef FEAT_TITLE
+-               need_maketitle = TRUE;
++               redraw_titles();
+ # endif
+            }
+        }
+@@ -5796,7 +5827,7 @@
+            else
+                curbuf->b_p_tx = FALSE;
+ #ifdef FEAT_TITLE
+-           need_maketitle = TRUE;
++           redraw_titles();
+ #endif
+            /* update flag in swap file */
+            ml_setflags(curbuf);
+@@ -6055,6 +6086,7 @@
                     errmsg = (char_u *)N_("E596: Invalid font(s)");
             }
@@ -4426 +4528 @@
  # ifdef FEAT_XFONTSET
      else if (varp == &p_guifontset)
-@@ -6063,6 +6068,7 @@
+@@ -6063,6 +6095,7 @@
             errmsg = (char_u *)N_("E597: can't select fontset");
         else if (gui.in_use && gui_init_font(p_guifontset, TRUE) != OK)
@@ -4434 +4536 @@
  # endif
  # ifdef FEAT_MBYTE
-@@ -6072,6 +6078,7 @@
+@@ -6072,6 +6105,7 @@
             errmsg = (char_u *)N_("E533: can't select wide font");
         else if (gui_get_wide_font() == FAIL)
@@ -4442 +4544 @@
  # endif
  #endif
-@@ -6133,13 +6140,24 @@
+@@ -6133,13 +6167,24 @@
  #ifdef FEAT_GUI
      /* 'guioptions' */
@@ -4467 +4569 @@
  
  #if defined(FEAT_MOUSE_TTY) && (defined(UNIX) || defined(VMS))
-@@ -6717,7 +6735,11 @@
+@@ -6717,7 +6762,11 @@
  
      if (curwin->w_curswant != MAXCOL)
@@ -4480 +4582 @@
      return errmsg;
  }
-@@ -7974,6 +7996,11 @@
+@@ -7105,22 +7154,28 @@
+            curbuf->b_did_warn = FALSE;
+ 
+ #ifdef FEAT_TITLE
+-       need_maketitle = TRUE;
++       redraw_titles();
+ #endif
+     }
+ 
+ #ifdef FEAT_TITLE
+     /* when 'modifiable' is changed, redraw the window title */
+     else if ((int *)varp == &curbuf->b_p_ma)
+-       need_maketitle = TRUE;
++    {
++       redraw_titles();
++    }
+     /* when 'endofline' is changed, redraw the window title */
+     else if ((int *)varp == &curbuf->b_p_eol)
+-       need_maketitle = TRUE;
+-#ifdef FEAT_MBYTE
+-    /* when 'bomb' is changed, redraw the window title */
++    {
++       redraw_titles();
++    }
++# ifdef FEAT_MBYTE
++    /* when 'bomb' is changed, redraw the window title and tab page text */
+     else if ((int *)varp == &curbuf->b_p_bomb)
+-       need_maketitle = TRUE;
+-#endif
++    {
++       redraw_titles();
++    }
++# endif
+ #endif
+ 
+     /* when 'bin' is set also set some other options */
+@@ -7128,7 +7183,7 @@
+     {
+        set_options_bin(old_value, curbuf->b_p_bin, opt_flags);
+ #ifdef FEAT_TITLE
+-       need_maketitle = TRUE;
++       redraw_titles();
+ #endif
+     }
+ 
+@@ -7279,7 +7334,7 @@
+        if (!value)
+            save_file_ff(curbuf);       /* Buffer is unchanged */
+ #ifdef FEAT_TITLE
+-       need_maketitle = TRUE;
++       redraw_titles();
+ #endif
+ #ifdef FEAT_AUTOCMD
+        modified_was_set = value;
+@@ -7714,7 +7769,7 @@
+        newFoldLevel();
+     }
+ 
+-    /* 'foldminlevel' */
++    /* 'foldminlines' */
+     else if (pp == &curwin->w_p_fml)
+     {
+        foldUpdateAll(curwin);
+@@ -7974,6 +8029,11 @@
         else /* curwin->w_p_scr > curwin->w_height */
             curwin->w_p_scr = curwin->w_height;
@@ -4492 +4657 @@
      {
         errmsg = e_positive;
-@@ -8227,13 +8254,13 @@
+@@ -8227,13 +8287,13 @@
             {
                 if (number == 0 && string != NULL)
@@ -4509 +4674 @@
                         /* There's another character after zeros or the string
                          * is empty.  In both cases, we are trying to set a
-@@ -8323,7 +8350,7 @@
+@@ -8323,7 +8383,7 @@
      {
         --arg;                      /* put arg at the '<' */
@@ -4520 +4685 @@
 diff -Naur vim72.orig/src/os_unix.c vim72/src/os_unix.c
 --- vim72.orig/src/os_unix.c    2008-08-06 04:01:40.000000000 -0700
-+++ vim72/src/os_unix.c 2009-02-07 22:18:01.281110211 -0800
++++ vim72/src/os_unix.c 2009-02-15 23:29:40.908282162 -0800
 @@ -315,12 +315,15 @@
      {-1,           "Unknown!", FALSE}
@@ -4652 +4817 @@
 diff -Naur vim72.orig/src/proto/eval.pro vim72/src/proto/eval.pro
 --- vim72.orig/src/proto/eval.pro       2008-08-09 07:31:25.000000000 -0700
-+++ vim72/src/proto/eval.pro    2009-02-07 22:15:36.283161615 -0800
++++ vim72/src/proto/eval.pro    2009-02-15 23:27:14.702915211 -0800
 @@ -17,7 +17,7 @@
  int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip));
@@ -4694 +4859 @@
 diff -Naur vim72.orig/src/proto/ex_cmds.pro vim72/src/proto/ex_cmds.pro
 --- vim72.orig/src/proto/ex_cmds.pro    2008-08-09 07:31:25.000000000 -0700
-+++ vim72/src/proto/ex_cmds.pro 2009-02-07 22:14:49.107148764 -0800
++++ vim72/src/proto/ex_cmds.pro 2009-02-15 23:26:29.540021232 -0800
 @@ -11,7 +11,7 @@
  char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
@@ -4706 +4871 @@
 diff -Naur vim72.orig/src/proto/ex_getln.pro vim72/src/proto/ex_getln.pro
 --- vim72.orig/src/proto/ex_getln.pro   2008-08-09 07:31:28.000000000 -0700
-+++ vim72/src/proto/ex_getln.pro        2009-02-07 22:15:46.007933510 -0800
++++ vim72/src/proto/ex_getln.pro        2009-02-15 23:27:23.655489034 -0800
 @@ -31,7 +31,7 @@
  void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col));
@@ -4718 +4883 @@
 diff -Naur vim72.orig/src/proto/mark.pro vim72/src/proto/mark.pro
 --- vim72.orig/src/proto/mark.pro       2008-08-09 07:31:36.000000000 -0700
-+++ vim72/src/proto/mark.pro    2009-02-07 22:14:49.107148764 -0800
++++ vim72/src/proto/mark.pro    2009-02-15 23:26:29.540021232 -0800
 @@ -26,5 +26,5 @@
  void write_viminfo_filemarks __ARGS((FILE *fp));
@@ -4728 +4893 @@
 diff -Naur vim72.orig/src/proto/misc2.pro vim72/src/proto/misc2.pro
 --- vim72.orig/src/proto/misc2.pro      2008-08-09 07:31:40.000000000 -0700
-+++ vim72/src/proto/misc2.pro   2009-02-07 22:16:52.932903479 -0800
++++ vim72/src/proto/misc2.pro   2009-02-15 23:28:32.423895795 -0800
 @@ -59,7 +59,7 @@
  int handle_x_keys __ARGS((int key));
@@ -4740 +4905 @@
 diff -Naur vim72.orig/src/proto/netbeans.pro vim72/src/proto/netbeans.pro
 --- vim72.orig/src/proto/netbeans.pro   2008-08-09 07:31:56.000000000 -0700
-+++ vim72/src/proto/netbeans.pro        2009-02-07 22:17:10.446515715 -0800
++++ vim72/src/proto/netbeans.pro        2009-02-15 23:28:48.048896773 -0800
 @@ -11,7 +11,7 @@
  void netbeans_frame_moved __ARGS((int new_x, int new_y));
@@ -4752 +4917 @@
 diff -Naur vim72.orig/src/pty.c vim72/src/pty.c
 --- vim72.orig/src/pty.c        2008-06-21 11:52:58.000000000 -0700
-+++ vim72/src/pty.c     2009-02-07 22:13:17.113511664 -0800
++++ vim72/src/pty.c     2009-02-15 23:24:57.546124598 -0800
 @@ -270,9 +270,10 @@
  }
@@ -4768 +4933 @@
 diff -Naur vim72.orig/src/screen.c vim72/src/screen.c
 --- vim72.orig/src/screen.c     2008-07-24 07:45:07.000000000 -0700
-+++ vim72/src/screen.c  2009-02-07 22:14:27.770892024 -0800
++++ vim72/src/screen.c  2009-02-15 23:26:05.654490571 -0800
 @@ -2439,9 +2439,17 @@
  
@@ -4792 +4957 @@
 diff -Naur vim72.orig/src/spell.c vim72/src/spell.c
 --- vim72.orig/src/spell.c      2008-07-12 12:20:55.000000000 -0700
-+++ vim72/src/spell.c   2009-02-07 22:16:39.143494343 -0800
++++ vim72/src/spell.c   2009-02-15 23:30:03.705744656 -0800
 @@ -77,7 +77,7 @@
  
@@ -4993 +5158 @@
   * ID in "flags" for the word "word".
   * The WF_RAREPFX flag is included in the return value for a rare prefix.
+@@ -2237,7 +2376,7 @@
+ 
+            /* If we are back at the starting line and there is no match then
+             * give up. */
+-           if (lnum == wp->w_cursor.lnum && !found_one)
++           if (lnum == wp->w_cursor.lnum && (!found_one || wrapped))
+                break;
+ 
+            /* Skip the characters at the start of the next line that were
 @@ -2513,9 +2652,11 @@
      lp->sl_midword = NULL;
@@ -5057 +5231 @@
      vim_free(pat);
      if (slang->sl_compprog == NULL)
-@@ -4915,6 +5080,7 @@
+@@ -4791,13 +4956,16 @@
+  * Structure that is used to store the items in the word tree.  This avoids
+  * the need to keep track of each allocated thing, everything is freed all at
+  * once after ":mkspell" is done.
++ * Note: "sb_next" must be just before "sb_data" to make sure the alignment of
++ * "sb_data" is correct for systems where pointers must be aligned on
++ * pointer-size boundaries and sizeof(pointer) > sizeof(int) (e.g., Sparc).
+  */
+ #define  SBLOCKSIZE 16000      /* size of sb_data */
+ typedef struct sblock_S sblock_T;
+ struct sblock_S
+ {
+-    sblock_T   *sb_next;       /* next block in list */
+     int                sb_used;        /* nr of bytes already in use */
++    sblock_T   *sb_next;       /* next block in list */
+     char_u     sb_data[1];     /* data, actually longer */
+ };
+ 
+@@ -4915,6 +5083,7 @@
  } spellinfo_T;
  
@@ -5065 +5257 @@
  static int spell_info_item __ARGS((char_u *s));
  static unsigned affitem2flag __ARGS((int flagtype, char_u *item, char_u        *fname, int lnum));
-@@ -4950,7 +5116,7 @@
+@@ -4950,7 +5119,7 @@
  static void put_sugtime __ARGS((spellinfo_T *spin, FILE *fd));
  static int write_vim_spell __ARGS((spellinfo_T *spin, char_u *fname));
@@ -5074 +5266 @@
  static int sug_filltree __ARGS((spellinfo_T *spin, slang_T *slang));
  static int sug_maketable __ARGS((spellinfo_T *spin));
-@@ -5223,8 +5389,7 @@
+@@ -5223,8 +5392,7 @@
         /* Handle non-empty lines. */
         if (itemcnt > 0)
@@ -5084 +5276 @@
  #ifdef FEAT_MBYTE
                 /* Setup for conversion from "ENC" to 'encoding'. */
-@@ -5239,7 +5404,7 @@
+@@ -5239,7 +5407,7 @@
                     smsg((char_u *)_("Conversion in %s not supported"), fname);
  #endif
@@ -5093 +5285 @@
             {
                 if (STRCMP(items[1], "long") == 0)
-@@ -5284,69 +5449,71 @@
+@@ -5284,69 +5452,71 @@
                         spin->si_info = p;
                     }
@@ -5181 +5373 @@
                 aff->af_compforbid = affitem2flag(aff->af_flagtype, items[1],
                                                                  fname, lnum);
-@@ -5354,8 +5521,8 @@
+@@ -5354,8 +5524,8 @@
                     smsg((char_u *)_("Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line %d"),
                             fname, lnum);
@@ -5192 +5384 @@
                 aff->af_comppermit = affitem2flag(aff->af_flagtype, items[1],
                                                                  fname, lnum);
-@@ -5363,7 +5530,7 @@
+@@ -5363,7 +5533,7 @@
                     smsg((char_u *)_("Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line %d"),
                             fname, lnum);
@@ -5201 +5393 @@
             {
                 /* Turn flag "c" into COMPOUNDRULE compatible string "c+",
-@@ -5376,7 +5543,15 @@
+@@ -5376,7 +5546,15 @@
                     compflags = p;
                 }
@@ -5218 +5410 @@
                 /* Concatenate this string to previously defined ones, using a
                  * slash to separate them. */
-@@ -5395,7 +5570,7 @@
+@@ -5395,7 +5573,7 @@
                     compflags = p;
                 }
@@ -5227 +5419 @@
             {
                 compmax = atoi((char *)items[1]);
-@@ -5403,7 +5578,7 @@
+@@ -5403,7 +5581,7 @@
                     smsg((char_u *)_("Wrong COMPOUNDWORDMAX value in %s line %d: %s"),
                                                        fname, lnum, items[1]);
@@ -5236 +5428 @@
             {
                 compminlen = atoi((char *)items[1]);
-@@ -5411,7 +5586,7 @@
+@@ -5411,7 +5589,7 @@
                     smsg((char_u *)_("Wrong COMPOUNDMIN value in %s line %d: %s"),
                                                        fname, lnum, items[1]);
@@ -5245 +5437 @@
             {
                 compsylmax = atoi((char *)items[1]);
-@@ -5419,32 +5594,29 @@
+@@ -5419,32 +5597,29 @@
                     smsg((char_u *)_("Wrong COMPOUNDSYLMAX value in %s line %d: %s"),
                                                        fname, lnum, items[1]);
@@ -5284 +5476 @@
                 garray_T    *gap = &spin->si_comppat;
                 int         i;
-@@ -5463,24 +5635,24 @@
+@@ -5463,24 +5638,24 @@
                                                = getroom_save(spin, items[2]);
                 }
@@ -5314 +5506 @@
                 aff->af_pfxpostpone = TRUE;
             }
-@@ -5771,24 +5943,20 @@
+@@ -5771,24 +5946,20 @@
                     }
                 }
@@ -5344 +5536 @@
                 /* Ignore REP/REPSAL count */;
                 if (!isdigit(*items[1]))
-@@ -5819,7 +5987,7 @@
+@@ -5819,7 +5990,7 @@
                                          : &spin->si_rep, items[1], items[2]);
                 }
@@ -5353 +5545 @@
                 /* MAP item or count */
                 if (!found_map)
-@@ -5856,9 +6024,8 @@
+@@ -5856,9 +6027,8 @@
                     ga_append(&spin->si_map, '/');
                 }
@@ -5365 +5557 @@
                 if (do_sal)
                 {
-@@ -5877,12 +6044,12 @@
+@@ -5877,12 +6047,12 @@
                                                                 : items[2]);
                 }
@@ -5380 +5572 @@
             {
                 sofoto = getroom_save(spin, items[1]);
-@@ -5980,7 +6147,7 @@
+@@ -5980,7 +6150,7 @@
         else if (spin->si_newprefID == 0 || spin->si_newprefID == 127)
             MSG(_("Too many compound flags"));
@@ -5389 +5581 @@
  
      if (syllable != NULL)
-@@ -6017,6 +6184,22 @@
+@@ -6017,6 +6187,22 @@
  }
  
@@ -5412 +5604 @@
   * ae_flags to ae_comppermit and ae_compforbid.
   */
-@@ -7926,6 +8109,8 @@
+@@ -7926,6 +8112,8 @@
      char_u     *p;
      int                rr;
@@ -5421 +5613 @@
      fd = mch_fopen((char *)fname, "w");
      if (fd == NULL)
-@@ -7936,11 +8121,11 @@
+@@ -7936,11 +8124,11 @@
  
      /* <HEADER>: <fileID> <versionnr> */
@@ -5438 +5630 @@
  
      /*
-@@ -7955,7 +8140,7 @@
+@@ -7955,7 +8143,7 @@
  
         i = (int)STRLEN(spin->si_info);
@@ -5447 +5639 @@
  
      /* SN_REGION: <regionname> ...
-@@ -7966,7 +8151,7 @@
+@@ -7966,7 +8154,7 @@
         putc(SNF_REQUIRED, fd);                         /* <sectionflags> */
         l = spin->si_region_count * 2;
@@ -5456 +5648 @@
         regionmask = (1 << spin->si_region_count) - 1;
      }
-@@ -8016,7 +8201,7 @@
+@@ -8016,7 +8204,7 @@
         }
  
@@ -5465 +5657 @@
  
      /* SN_MIDWORD: <midword> */
-@@ -8027,7 +8212,8 @@
+@@ -8027,7 +8215,8 @@
  
         i = (int)STRLEN(spin->si_midword);
@@ -5475 +5667 @@
  
      /* SN_PREFCOND: <prefcondcnt> <prefcond> ... */
-@@ -8113,7 +8299,8 @@
+@@ -8113,7 +8302,8 @@
                 p = rr == 1 ? ftp->ft_from : ftp->ft_to;
                 l = (int)STRLEN(p);
@@ -5485 +5677 @@
         }
  
-@@ -8131,11 +8318,11 @@
+@@ -8131,11 +8321,11 @@
                                                         /* <sectionlen> */
  
@@ -5499 +5691 @@
  
      /* SN_WORDS: <word> ...
-@@ -8160,7 +8347,7 @@
+@@ -8160,7 +8350,7 @@
                     l = (int)STRLEN(hi->hi_key) + 1;
                     len += l;
@@ -5508 +5700 @@
                 }
             if (round == 1)
-@@ -8176,7 +8363,7 @@
+@@ -8176,7 +8366,7 @@
         putc(0, fd);                                    /* <sectionflags> */
         l = spin->si_map.ga_len;
@@ -5517 +5709 @@
      }
  
-@@ -8232,10 +8419,11 @@
+@@ -8232,10 +8422,11 @@
         {
             p = ((char_u **)(spin->si_comppat.ga_data))[i];
@@ -5531 +5723 @@
      }
  
-@@ -8259,7 +8447,8 @@
+@@ -8259,7 +8450,8 @@
  
         l = (int)STRLEN(spin->si_syllable);
@@ -5541 +5733 @@
  
      /* end of <SECTIONS> */
-@@ -8295,13 +8484,18 @@
+@@ -8295,13 +8487,18 @@
         (void)put_node(fd, tree, 0, regionmask, round == 3);
      }
@@ -5562 +5754 @@
  }
  
-@@ -9890,6 +10084,7 @@
+@@ -9890,6 +10087,7 @@
      char_u     *p;
      int                len;
@@ -5570 +5762 @@
      if (fd != NULL)
         put_bytes(fd, (long_u)gap->ga_len, 2);      /* <prefcondcnt> */
-@@ -9906,7 +10101,7 @@
+@@ -9906,7 +10104,7 @@
             if (fd != NULL)
             {
@@ -5579 +5771 @@
             totlen += len;
         }
-@@ -11480,15 +11675,24 @@
+@@ -11480,15 +11678,24 @@
                     vim_strncpy(preword + sp->ts_prewordlen,
                             tword + sp->ts_splitoff,
@@ -5611 +5803 @@
                     p = preword + sp->ts_prewordlen;
                     mb_ptr_back(preword, p);
-@@ -11685,10 +11889,9 @@
+@@ -11685,10 +11892,9 @@
                         && (slang->sl_compsylmax < MAXWLEN
                             || sp->ts_complen + 1 - sp->ts_compsplit
@@ -5625 +5817 @@
                     try_compound = TRUE;
                     compflags[sp->ts_complen] = ((unsigned)flags >> 24);
+@@ -14808,7 +15014,7 @@
+ 
+        case 0:
+            /*
+-            * Lenghts are equal, thus changes must result in same length: An
++            * Lengths are equal, thus changes must result in same length: An
+             * insert is only possible in combination with a delete.
+             * 1: check if for identical strings
+             */
 diff -Naur vim72.orig/src/structs.h vim72/src/structs.h
 --- vim72.orig/src/structs.h    2008-07-30 13:02:50.000000000 -0700
-+++ vim72/src/structs.h 2009-02-07 22:15:20.110754575 -0800
++++ vim72/src/structs.h 2009-02-15 23:26:58.897901382 -0800
 @@ -459,7 +459,7 @@
  typedef struct
@@ -5656 +5857 @@
 diff -Naur vim72.orig/src/tag.c vim72/src/tag.c
 --- vim72.orig/src/tag.c        2008-07-16 14:31:30.000000000 -0700
-+++ vim72/src/tag.c     2009-02-07 22:17:21.020306747 -0800
++++ vim72/src/tag.c     2009-02-15 23:28:59.441624807 -0800
 @@ -515,7 +515,7 @@
              * If a count is supplied to the ":tag <name>" command, then
@@ -5711 +5912 @@
 diff -Naur vim72.orig/src/term.c vim72/src/term.c
 --- vim72.orig/src/term.c       2008-07-27 04:48:06.000000000 -0700
-+++ vim72/src/term.c    2009-02-07 22:17:26.245680123 -0800
++++ vim72/src/term.c    2009-02-15 23:29:04.669961167 -0800
 @@ -4920,7 +4920,15 @@
         key_name[0] = KEY2TERMCAP0(key);
@@ -5731 +5932 @@
 diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile
 --- vim72.orig/src/testdir/Makefile     2008-06-19 13:29:46.000000000 -0700
-+++ vim72/src/testdir/Makefile  2009-02-07 22:14:04.798116497 -0800
++++ vim72/src/testdir/Makefile  2009-02-15 23:25:42.545008241 -0800
 @@ -26,15 +26,17 @@
  
@@ -5765 +5966 @@
 diff -Naur vim72.orig/src/testdir/Make_ming.mak vim72/src/testdir/Make_ming.mak
 --- vim72.orig/src/testdir/Make_ming.mak        1969-12-31 16:00:00.000000000 -0800
-+++ vim72/src/testdir/Make_ming.mak     2009-02-07 22:14:24.920315687 -0800
++++ vim72/src/testdir/Make_ming.mak     2009-02-15 23:26:03.078324067 -0800
 @@ -0,0 +1,91 @@
 +# Makefile to run tests for Vim, on Dos-like machines
@@ -5860 +6061 @@
 diff -Naur vim72.orig/src/testdir/test42.ok vim72/src/testdir/test42.ok
 --- vim72.orig/src/testdir/test42.ok    2008-02-20 04:27:37.000000000 -0800
-+++ vim72/src/testdir/test42.ok 2009-02-07 22:14:55.472752061 -0800
++++ vim72/src/testdir/test42.ok 2009-02-15 23:26:34.640348093 -0800
 @@ -20,7 +20,7 @@
  ucs-2
@@ -5872 +6073 @@
 diff -Naur vim72.orig/src/ui.c vim72/src/ui.c
 --- vim72.orig/src/ui.c 2008-07-14 11:14:56.000000000 -0700
-+++ vim72/src/ui.c      2009-02-07 22:16:00.150072915 -0800
++++ vim72/src/ui.c      2009-02-15 23:27:36.164291102 -0800
 @@ -1820,7 +1820,7 @@
  #ifdef HAVE_DUP
@@ -5980 +6181 @@
 diff -Naur vim72.orig/src/version.c vim72/src/version.c
 --- vim72.orig/src/version.c    2008-08-09 07:24:52.000000000 -0700
-+++ vim72/src/version.c 2009-02-07 22:18:15.152545887 -0800
-@@ -677,9 +677,204 @@
++++ vim72/src/version.c 2009-02-15 23:30:11.834265120 -0800
+@@ -677,9 +677,216 @@
  static int included_patches[] =
  {   /* Add new patch number below this line */
  /**/
++    108,
++/**/
++    107,
++/**/
++    106,
++/**/
++    105,
++/**/
++    104,
++/**/
++    103,
++/**/
 +    102,
 +/**/
@@ -6186 +6399 @@
  highest_patch()
  {
-@@ -786,7 +981,7 @@
+@@ -786,7 +993,7 @@
      MSG_PUTS(_("\nRISC OS version"));
  #endif
@@ -6195 +6408 @@
      if (*compiled_arch != NUL)
      {
-@@ -825,6 +1020,19 @@
+@@ -825,6 +1032,19 @@
         }
      }
@@ -6217 +6430 @@
 diff -Naur vim72.orig/src/vim.h vim72/src/vim.h
 --- vim72.orig/src/vim.h        2008-08-09 09:03:38.000000000 -0700
-+++ vim72/src/vim.h     2009-02-07 22:15:33.719691856 -0800
++++ vim72/src/vim.h     2009-02-15 23:27:12.174753177 -0800
 @@ -341,8 +341,14 @@
  #ifdef BACKSLASH_IN_FILENAME
@@ -6277 +6490 @@
 diff -Naur vim72.orig/src/window.c vim72/src/window.c
 --- vim72.orig/src/window.c     2008-08-06 04:00:30.000000000 -0700
-+++ vim72/src/window.c  2009-02-07 22:16:00.150072915 -0800
++++ vim72/src/window.c  2009-02-15 23:27:36.164291102 -0800
 @@ -4028,14 +4028,14 @@
             if (mch_dirname(cwd, MAXPATHL) == OK)
@@ -6298 +6511 @@
 diff -Naur vim72.orig/src/workshop.c vim72/src/workshop.c
 --- vim72.orig/src/workshop.c   2008-06-21 11:53:26.000000000 -0700
-+++ vim72/src/workshop.c        2009-02-07 22:15:51.274319877 -0800
++++ vim72/src/workshop.c        2009-02-15 23:27:29.719875680 -0800
 @@ -1121,8 +1121,12 @@
                                       ? (char *)curbuf->b_sfname : "<None>");