Changeset 95f1c95 in clfs-sysroot for patches/vim-7.0-fixes-22.patch

Timestamp:

Feb 6, 2007, 12:57:56 PM (19 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

master

Children:

b8f0f75

Parents:

7ea0123

Message:

Update patches.

File:

• patches/vim-7.0-fixes-22.patch (moved) (moved from patches/vim-7.0-fixes-21.patch ) (168 diffs)

patches/vim-7.0-fixes-22.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 12-05-2006
+Date: 01-23-2007
 Initial Package Version: 7.0
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 7.0.178
+Description: Contains all upstream patches up to 7.0.188
              The following patches were skipped
-             005 027 028 032 045 057 065 074 108 130 131 132 138 156 161 170 171
+             005 027 028 032 045 057 065 074 108 130 131 132 138 156 161 170 171 180
 
 diff -Naur vim70.orig/configure vim70/configure
 --- vim70.orig/configure        2004-07-05 02:02:24.000000000 -0700
-+++ vim70/configure     2006-12-05 19:57:51.000000000 -0800
++++ vim70/configure     2007-01-23 17:14:51.000000000 -0800
 @@ -3,4 +3,4 @@
  # This is just a stub for the Unix configure script, to provide support for
@@ -19 +19 @@
 diff -Naur vim70.orig/runtime/autoload/ccomplete.vim vim70/runtime/autoload/ccomplete.vim
 --- vim70.orig/runtime/autoload/ccomplete.vim   2006-05-03 07:35:56.000000000 -0700
-+++ vim70/runtime/autoload/ccomplete.vim        2006-12-05 19:57:40.000000000 -0800
++++ vim70/runtime/autoload/ccomplete.vim        2007-01-23 17:14:45.000000000 -0800
 @@ -1,7 +1,7 @@
  " Vim completion script
@@ -40 +40 @@
 diff -Naur vim70.orig/runtime/autoload/gzip.vim vim70/runtime/autoload/gzip.vim
 --- vim70.orig/runtime/autoload/gzip.vim        2006-03-31 07:12:15.000000000 -0800
-+++ vim70/runtime/autoload/gzip.vim     2006-12-05 19:58:04.000000000 -0800
++++ vim70/runtime/autoload/gzip.vim     2007-01-23 17:15:02.000000000 -0800
 @@ -1,6 +1,6 @@
  " Vim autoload file for editing compressed files.
@@ -101 +101 @@
 diff -Naur vim70.orig/runtime/autoload/paste.vim vim70/runtime/autoload/paste.vim
 --- vim70.orig/runtime/autoload/paste.vim       2006-04-21 11:31:01.000000000 -0700
-+++ vim70/runtime/autoload/paste.vim    2006-12-05 19:57:46.000000000 -0800
++++ vim70/runtime/autoload/paste.vim    2007-01-23 17:14:49.000000000 -0800
 @@ -1,6 +1,6 @@
  " Vim support file to help with paste mappings and menus
@@ -121 +121 @@
 diff -Naur vim70.orig/runtime/autoload/spellfile.vim vim70/runtime/autoload/spellfile.vim
 --- vim70.orig/runtime/autoload/spellfile.vim   2006-02-01 04:12:24.000000000 -0800
-+++ vim70/runtime/autoload/spellfile.vim        2006-12-05 19:57:58.000000000 -0800
++++ vim70/runtime/autoload/spellfile.vim        2007-01-23 17:14:56.000000000 -0800
 @@ -1,9 +1,9 @@
  " Vim script to download a missing spell file
@@ -175 +175 @@
 +  endif
 +endfunc
+diff -Naur vim70.orig/runtime/doc/autocmd.txt vim70/runtime/doc/autocmd.txt
+--- vim70.orig/runtime/doc/autocmd.txt  2006-05-07 05:16:44.000000000 -0700
++++ vim70/runtime/doc/autocmd.txt       2007-01-23 17:15:23.000000000 -0800
+@@ -1,4 +1,4 @@
+-*autocmd.txt*   For Vim version 7.0.  Last change: 2006 May 06
++*autocmd.txt*   For Vim version 7.0.  Last change: 2007 Jan 16
+ 
+ 
+                  VIM REFERENCE MANUAL    by Bram Moolenaar
+@@ -279,6 +279,7 @@
+ |FuncUndefined|                a user function is used but it isn't defined
+ |SpellFileMissing|     a spell file is used but it can't be found
+ |SourcePre|            before sourcing a Vim script
++|SourceCmd|            before sourcing a Vim script |Cmd-event|
+ 
+ |VimResized|           after the Vim window size changed
+ |FocusGained|          Vim got input focus
+@@ -690,10 +691,17 @@
+                                Can be used to check for any changed files.
+                                                        *SourcePre*
+ SourcePre                      Before sourcing a Vim script. |:source|
++                               <afile> is the name of the file being sourced.
++                                                       *SourceCmd*
++SourceCmd                      When sourcing a Vim script. |:source|
++                               <afile> is the name of the file being sourced.
++                               The autocommand must source this file.
++                               |Cmd-event|
+                                                        *SpellFileMissing*
+ SpellFileMissing               When trying to load a spell checking file and
+-                               it can't be found.  <amatch> is the language,
+-                               'encoding' also matters.  See
++                               it can't be found.  The pattern is matched
++                               against the language.  <amatch> is the
++                               language, 'encoding' also matters.  See
+                                |spell-SpellFileMissing|.
+                                                        *StdinReadPost*
+ StdinReadPost                  After reading from the stdin into the buffer,
+@@ -1219,8 +1227,8 @@
+ 
+                                                        *Cmd-event*
+ When using one of the "*Cmd" events, the matching autocommands are expected to
+-do the file reading or writing.  This can be used when working with a special
+-kind of file, for example on a remote system.
++do the file reading, writing or sourcing.  This can be used when working with
++a special kind of file, for example on a remote system.
+ CAREFUL: If you use these events in a wrong way, it may have the effect of
+ making it impossible to read or write the matching files!  Make sure you test
+ your autocommands properly.  Best is to use a pattern that will never match a
+@@ -1233,9 +1241,10 @@
+ original file isn't needed for recovery.  You might want to do this only when
+ you expect the file to be modified.
+ 
+-The |v:cmdarg| variable holds the "++enc=" and "++ff=" argument that are
+-effective.  These should be used for the command that reads/writes the file.
+-The |v:cmdbang| variable is one when "!" was used, zero otherwise.
++For file read and write commands the |v:cmdarg| variable holds the "++enc="
++and "++ff=" argument that are effective.  These should be used for the command
++that reads/writes the file.  The |v:cmdbang| variable is one when "!" was
++used, zero otherwise.
+ 
+ See the $VIMRUNTIME/plugin/netrw.vim for examples.
+ 
 diff -Naur vim70.orig/runtime/doc/eval.txt vim70/runtime/doc/eval.txt
 --- vim70.orig/runtime/doc/eval.txt     2006-05-07 05:16:44.000000000 -0700
-+++ vim70/runtime/doc/eval.txt  2006-12-05 19:58:10.000000000 -0800
++++ vim70/runtime/doc/eval.txt  2007-01-23 17:15:09.000000000 -0800
 @@ -1,4 +1,4 @@
 -*eval.txt*      For Vim version 7.0.  Last change: 2006 May 06
@@ -257 +319 @@
 diff -Naur vim70.orig/runtime/doc/netbeans.txt vim70/runtime/doc/netbeans.txt
 --- vim70.orig/runtime/doc/netbeans.txt 2006-05-07 05:16:45.000000000 -0700
-+++ vim70/runtime/doc/netbeans.txt      2006-12-05 19:58:11.000000000 -0800
++++ vim70/runtime/doc/netbeans.txt      2007-01-23 17:15:10.000000000 -0800
 @@ -1,4 +1,4 @@
 -*netbeans.txt*  For Vim version 7.0.  Last change: 2006 Mar 09
@@ -293 +355 @@
 diff -Naur vim70.orig/runtime/menu.vim vim70/runtime/menu.vim
 --- vim70.orig/runtime/menu.vim 2006-04-17 06:47:28.000000000 -0700
-+++ vim70/runtime/menu.vim      2006-12-05 19:58:04.000000000 -0800
++++ vim70/runtime/menu.vim      2007-01-23 17:15:02.000000000 -0800
 @@ -2,7 +2,7 @@
  " You can also use this as a start for your own set of menus.
@@ -360 +422 @@
 diff -Naur vim70.orig/runtime/plugin/matchparen.vim vim70/runtime/plugin/matchparen.vim
 --- vim70.orig/runtime/plugin/matchparen.vim    2006-04-27 06:31:26.000000000 -0700
-+++ vim70/runtime/plugin/matchparen.vim 2006-12-05 19:58:01.000000000 -0800
++++ vim70/runtime/plugin/matchparen.vim 2007-01-23 17:15:00.000000000 -0800
 @@ -1,6 +1,6 @@
  " Vim plugin for showing matching parens
@@ -403 +465 @@
 diff -Naur vim70.orig/runtime/scripts.vim vim70/runtime/scripts.vim
 --- vim70.orig/runtime/scripts.vim      2006-03-28 11:30:49.000000000 -0800
-+++ vim70/runtime/scripts.vim   2006-12-05 19:57:51.000000000 -0800
++++ vim70/runtime/scripts.vim   2007-01-23 17:14:51.000000000 -0800
 @@ -1,7 +1,7 @@
  " Vim support file to detect file types in scripts
@@ -428 +490 @@
 diff -Naur vim70.orig/runtime/tutor/Makefile vim70/runtime/tutor/Makefile
 --- vim70.orig/runtime/tutor/Makefile   2004-06-07 07:32:39.000000000 -0700
-+++ vim70/runtime/tutor/Makefile        2006-12-05 19:58:01.000000000 -0800
++++ vim70/runtime/tutor/Makefile        2007-01-23 17:15:00.000000000 -0800
 @@ -2,8 +2,13 @@
  #
@@ -462 +524 @@
 diff -Naur vim70.orig/runtime/tutor/tutor.gr.utf-8 vim70/runtime/tutor/tutor.gr.utf-8
 --- vim70.orig/runtime/tutor/tutor.gr.utf-8     1969-12-31 16:00:00.000000000 -0800
-+++ vim70/runtime/tutor/tutor.gr.utf-8  2006-12-05 19:58:01.000000000 -0800
++++ vim70/runtime/tutor/tutor.gr.utf-8  2007-01-23 17:15:00.000000000 -0800
 @@ -0,0 +1,815 @@
 +===============================================================================
@@ -1495 +1557 @@
 diff -Naur vim70.orig/runtime/tutor/tutor.ru.utf-8 vim70/runtime/tutor/tutor.ru.utf-8
 --- vim70.orig/runtime/tutor/tutor.ru.utf-8     1969-12-31 16:00:00.000000000 -0800
-+++ vim70/runtime/tutor/tutor.ru.utf-8  2006-12-05 19:57:59.000000000 -0800
++++ vim70/runtime/tutor/tutor.ru.utf-8  2007-01-23 17:14:56.000000000 -0800
 @@ -0,0 +1,834 @@
 +===============================================================================
@@ -2416 +2478 @@
 diff -Naur vim70.orig/runtime/tutor/tutor.vim vim70/runtime/tutor/tutor.vim
 --- vim70.orig/runtime/tutor/tutor.vim  2006-03-18 12:20:36.000000000 -0800
-+++ vim70/runtime/tutor/tutor.vim       2006-12-05 19:58:01.000000000 -0800
++++ vim70/runtime/tutor/tutor.vim       2007-01-23 17:15:00.000000000 -0800
 @@ -1,6 +1,6 @@
  " Vim tutor support file
@@ -2468 +2530 @@
 diff -Naur vim70.orig/src/auto/configure vim70/src/auto/configure
 --- vim70.orig/src/auto/configure       2006-05-04 03:46:19.000000000 -0700
-+++ vim70/src/auto/configure    2006-12-05 19:58:07.000000000 -0800
++++ vim70/src/auto/configure    2007-01-23 17:15:06.000000000 -0800
 @@ -4014,7 +4014,7 @@
        LDFLAGS=$ldflags_save
@@ -2509 +2571 @@
 diff -Naur vim70.orig/src/buffer.c vim70/src/buffer.c
 --- vim70.orig/src/buffer.c     2006-04-26 14:37:23.000000000 -0700
-+++ vim70/src/buffer.c  2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/buffer.c  2007-01-23 17:15:10.000000000 -0800
 @@ -434,12 +434,8 @@
      if (usingNetbeans)
@@ -2660 +2722 @@
 diff -Naur vim70.orig/src/configure vim70/src/configure
 --- vim70.orig/src/configure    2006-05-07 07:17:49.000000000 -0700
-+++ vim70/src/configure 2006-12-05 19:57:51.000000000 -0800
++++ vim70/src/configure 2007-01-23 17:14:51.000000000 -0800
 @@ -2,5 +2,9 @@
  # run the automatically generated configure script
@@ -2673 +2735 @@
 diff -Naur vim70.orig/src/configure.in vim70/src/configure.in
 --- vim70.orig/src/configure.in 2006-05-04 03:46:11.000000000 -0700
-+++ vim70/src/configure.in      2006-12-05 19:58:07.000000000 -0800
++++ vim70/src/configure.in      2007-01-23 17:15:06.000000000 -0800
 @@ -508,7 +508,8 @@
        LDFLAGS=$ldflags_save
@@ -2716 +2778 @@
 diff -Naur vim70.orig/src/edit.c vim70/src/edit.c
 --- vim70.orig/src/edit.c       2006-05-07 04:48:51.000000000 -0700
-+++ vim70/src/edit.c    2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/edit.c    2007-01-23 17:15:10.000000000 -0800
 @@ -129,7 +129,7 @@
  
@@ -3337 +3399 @@
 diff -Naur vim70.orig/src/eval.c vim70/src/eval.c
 --- vim70.orig/src/eval.c       2006-05-05 10:15:26.000000000 -0700
-+++ vim70/src/eval.c    2006-12-05 19:58:24.000000000 -0800
++++ vim70/src/eval.c    2007-01-23 17:15:12.000000000 -0800
 @@ -166,7 +166,6 @@
      int                uf_tm_count;    /* nr of calls */
@@ -3399 +3461 @@
  static void copy_tv __ARGS((typval_T *from, typval_T *to));
  static int item_copy __ARGS((typval_T *from, typval_T *to, int deep, int copyID));
-@@ -2260,7 +2262,7 @@
+@@ -896,6 +898,7 @@
+ }
+ 
+ static lval_T  *redir_lval = NULL;
++static garray_T redir_ga;      /* only valid when redir_lval is not NULL */
+ static char_u  *redir_endp = NULL;
+ static char_u  *redir_varname = NULL;
+ 
+@@ -930,6 +933,9 @@
+        return FAIL;
+     }
+ 
++    /* The output is stored in growarray "redir_ga" until redirection ends. */
++    ga_init2(&redir_ga, (int)sizeof(char), 500);
++
+     /* Parse the variable name (can be a dict or list entry). */
+     redir_endp = get_lval(redir_varname, NULL, redir_lval, FALSE, FALSE, FALSE,
+                                                             FNE_CHECK_START);
+@@ -972,42 +978,36 @@
+ }
+ 
+ /*
+- * Append "value[len]" to the variable set by var_redir_start().
++ * Append "value[value_len]" to the variable set by var_redir_start().
++ * The actual appending is postponed until redirection ends, because the value
++ * appended may in fact be the string we write to, changing it may cause freed
++ * memory to be used:
++ *   :redir => foo
++ *   :let foo
++ *   :redir END
+  */
+     void
+-var_redir_str(value, len)
++var_redir_str(value, value_len)
+     char_u     *value;
+-    int                len;
++    int                value_len;
+ {
+-    char_u     *val;
+-    typval_T   tv;
+-    int                save_emsg;
+-    int                err;
++    size_t     len;
+ 
+     if (redir_lval == NULL)
+        return;
+ 
+-    if (len == -1)
+-       /* Append the entire string */
+-       val = vim_strsave(value);
++    if (value_len == -1)
++       len = STRLEN(value);    /* Append the entire string */
+     else
+-       /* Append only the specified number of characters */
+-       val = vim_strnsave(value, len);
+-    if (val == NULL)
+-       return;
++       len = value_len;        /* Append only "value_len" characters */
+ 
+-    tv.v_type = VAR_STRING;
+-    tv.vval.v_string = val;
+-
+-    save_emsg = did_emsg;
+-    did_emsg = FALSE;
+-    set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
+-    err = did_emsg;
+-    did_emsg |= save_emsg;
+-    if (err)
++    if (ga_grow(&redir_ga, (int)len) == OK)
++    {
++       mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len);
++       redir_ga.ga_len += len;
++    }
++    else
+        var_redir_stop();
+-
+-    vim_free(tv.vval.v_string);
+ }
+ 
+ /*
+@@ -1016,8 +1016,19 @@
+     void
+ var_redir_stop()
+ {
++    typval_T   tv;
++
+     if (redir_lval != NULL)
+     {
++       /* Append the trailing NUL. */
++       ga_append(&redir_ga, NUL);
++
++       /* Assign the text to the variable. */
++       tv.v_type = VAR_STRING;
++       tv.vval.v_string = redir_ga.ga_data;
++       set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
++       vim_free(tv.vval.v_string);
++
+        clear_lval(redir_lval);
+        vim_free(redir_lval);
+        redir_lval = NULL;
+@@ -2260,7 +2271,7 @@
             EMSG(_(e_letunexp));
         else
@@ -3408 +3570 @@
  
             p = get_tv_string_chk(tv);
-@@ -2269,7 +2271,7 @@
+@@ -2269,7 +2280,7 @@
                 s = get_reg_contents(*arg == '@' ? '"' : *arg, TRUE, TRUE);
                 if (s != NULL)
@@ -3417 +3579 @@
                 }
             }
-@@ -2278,7 +2280,7 @@
+@@ -2278,7 +2289,7 @@
                 write_reg_contents(*arg == '@' ? '"' : *arg, p, -1, FALSE);
                 arg_end = arg + 1;
@@ -3426 +3588 @@
      }
  
-@@ -3125,7 +3127,12 @@
+@@ -3125,7 +3136,12 @@
      funcdict_T fudi;
  
@@ -3440 +3602 @@
         return;
  
-@@ -3177,9 +3184,18 @@
+@@ -3177,9 +3193,18 @@
             failed = TRUE;
             break;
@@ -3459 +3621 @@
          * occurred or an exception was thrown but not caught.
          * get_func_tv() returned OK, so that the check for trailing
-@@ -3364,6 +3380,8 @@
+@@ -3364,6 +3389,8 @@
         hi = hash_find(ht, varname);
         if (!HASHITEM_EMPTY(hi))
@@ -3468 +3630 @@
                 return FAIL;
             delete_var(ht, hi);
-@@ -4895,7 +4913,7 @@
+@@ -4895,7 +4922,7 @@
                     {
                         if (list_append_tv(l, &item->li_tv) == FAIL)
@@ -3477 +3639 @@
                         }
                         item = item->li_next;
-@@ -5295,7 +5313,7 @@
+@@ -5295,7 +5322,7 @@
         EMSG2(_("E697: Missing end of List ']': %s"), *arg);
  failret:
@@ -3486 +3648 @@
      }
  
-@@ -5359,8 +5377,8 @@
+@@ -5359,8 +5386,8 @@
  list_unref(l)
      list_T *l;
@@ -3497 +3659 @@
  
  /*
-@@ -5368,14 +5386,12 @@
+@@ -5368,14 +5395,12 @@
   * Ignores the reference count.
   */
@@ -3515 +3677 @@
      if (l->lv_used_prev == NULL)
         first_list = l->lv_used_next;
-@@ -5388,7 +5404,10 @@
+@@ -5388,7 +5413,10 @@
      {
         /* Remove the item before deleting it. */
@@ -3527 +3689 @@
      vim_free(l);
  }
-@@ -5448,6 +5467,8 @@
+@@ -5448,6 +5476,8 @@
  {
      listitem_T *item1, *item2;
@@ -3536 +3698 @@
         return FALSE;
  
-@@ -5484,6 +5505,8 @@
+@@ -5484,6 +5514,8 @@
      dictitem_T *item2;
      int                todo;
@@ -3545 +3707 @@
         return FALSE;
  
-@@ -5516,19 +5539,29 @@
+@@ -5516,19 +5548,29 @@
  {
      char_u     buf1[NUMBUFLEN], buf2[NUMBUFLEN];
@@ -3579 +3741 @@
         case VAR_FUNC:
             return (tv1->vval.v_string != NULL
-@@ -6059,6 +6092,10 @@
+@@ -6059,6 +6101,10 @@
      tabpage_T  *tp;
  #endif
@@ -3590 +3752 @@
       * 1. Go through all accessible variables and mark all lists and dicts
       *    with copyID.
-@@ -6097,7 +6134,10 @@
+@@ -6097,7 +6143,10 @@
      for (dd = first_dict; dd != NULL; )
         if (dd->dv_copyID != copyID)
@@ -3602 +3764 @@
  
             /* restart, next dict may also have been freed */
-@@ -6114,7 +6154,10 @@
+@@ -6114,7 +6163,10 @@
      for (ll = first_list; ll != NULL; )
         if (ll->lv_copyID != copyID && ll->lv_watch == NULL)
@@ -3614 +3776 @@
  
             /* restart, next list may also have been freed */
-@@ -6207,11 +6250,12 @@
+@@ -6207,11 +6259,12 @@
      d = (dict_T *)alloc(sizeof(dict_T));
      if (d != NULL)
@@ -3628 +3790 @@
         hash_init(&d->dv_hashtab);
         d->dv_lock = 0;
-@@ -6229,8 +6273,8 @@
+@@ -6229,8 +6282,8 @@
  dict_unref(d)
      dict_T *d;
@@ -3639 +3801 @@
  
  /*
-@@ -6238,16 +6282,14 @@
+@@ -6238,16 +6291,14 @@
   * Ignores the reference count.
   */
@@ -3659 +3821 @@
      if (d->dv_used_prev == NULL)
         first_dict = d->dv_used_next;
-@@ -6267,7 +6309,10 @@
+@@ -6267,7 +6318,10 @@
              * something recursive causing trouble. */
             di = HI2DI(hi);
@@ -3671 +3833 @@
         }
      }
-@@ -6718,7 +6763,7 @@
+@@ -6718,7 +6772,7 @@
         EMSG2(_("E723: Missing end of Dictionary '}': %s"), *arg);
  failret:
@@ -3680 +3842 @@
      }
  
-@@ -7139,6 +7184,7 @@
+@@ -7139,6 +7193,7 @@
      {"setreg",         2, 3, f_setreg},
      {"settabwinvar",   4, 4, f_settabwinvar},
@@ -3688 +3850 @@
      {"sort",           1, 2, f_sort},
      {"soundfold",      1, 1, f_soundfold},
-@@ -7595,8 +7641,8 @@
+@@ -7595,8 +7650,8 @@
   * Give an error message with a function name.  Handle <SNR> things.
   */
@@ -3699 +3861 @@
  {
      char_u     *p;
-@@ -7605,7 +7651,7 @@
+@@ -7605,7 +7660,7 @@
         p = concat_str((char_u *)"<SNR>", name + 3);
      else
@@ -3708 +3870 @@
         vim_free(p);
  }
-@@ -8252,6 +8298,12 @@
+@@ -8252,6 +8307,12 @@
         EMSG(_("E785: complete() can only be used in Insert mode"));
         return;
@@ -3721 +3883 @@
      {
         EMSG(_(e_invarg));
-@@ -9173,25 +9225,25 @@
+@@ -9173,25 +9234,25 @@
      typval_T   save_key;
      int                rem;
@@ -3751 +3913 @@
      }
  
-@@ -9223,7 +9275,7 @@
+@@ -9223,7 +9284,7 @@
                 {
                     --todo;
@@ -3760 +3922 @@
                     vimvars[VV_KEY].vv_str = vim_strsave(di->di_key);
                     if (filter_map_one(&di->di_tv, expr, map, &rem) == FAIL
-@@ -9242,7 +9294,7 @@
+@@ -9242,7 +9303,7 @@
         {
             for (li = l->lv_first; li != NULL; li = nli)
@@ -3769 +3931 @@
                 nli = li->li_next;
                 if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL
-@@ -9598,7 +9650,9 @@
+@@ -9598,7 +9659,9 @@
      typval_T   *argvars;
      typval_T   *rettv;
@@ -3780 +3942 @@
  
  /*
-@@ -9792,6 +9846,9 @@
+@@ -9792,6 +9855,9 @@
      varnumber_T                n;
      int                        error = FALSE;
@@ -3790 +3952 @@
      ++allow_keys;
      if (argvars[0].v_type == VAR_UNKNOWN)
-@@ -9809,6 +9866,10 @@
+@@ -9809,6 +9875,10 @@
      --no_mapping;
      --allow_keys;
@@ -3801 +3963 @@
      if (IS_SPECIAL(n) || mod_mask != 0)
      {
-@@ -9837,6 +9898,53 @@
+@@ -9837,6 +9907,53 @@
         temp[i++] = NUL;
         rettv->v_type = VAR_STRING;
@@ -3855 +4017 @@
  }
  
-@@ -10412,20 +10520,14 @@
+@@ -10412,20 +10529,14 @@
  
      if (win != NULL && varname != NULL)
@@ -3882 +4044 @@
         {
             if (*varname == NUL)
-@@ -10438,6 +10540,10 @@
+@@ -10438,6 +10549,10 @@
             if (v != NULL)
                 copy_tv(&v->di_tv, rettv);
@@ -3893 +4055 @@
  
      --emsg_off;
-@@ -11312,14 +11418,19 @@
+@@ -11312,14 +11427,19 @@
  
  static int inputsecret_flag = 0;
@@ -3916 +4078 @@
      char_u     *prompt = get_tv_string_chk(&argvars[0]);
      char_u     *p = NULL;
-@@ -11369,10 +11480,10 @@
+@@ -11369,10 +11489,10 @@
             if (defstr != NULL)
                 stuffReadbuffSpec(defstr);
@@ -3929 +4091 @@
  
                 rettv->vval.v_string = NULL;
-@@ -11404,6 +11515,18 @@
+@@ -11404,6 +11524,18 @@
  }
  
@@ -3948 +4110 @@
   */
      static void
-@@ -11443,7 +11566,7 @@
+@@ -11443,7 +11575,7 @@
      }
      else
@@ -3957 +4119 @@
  
  /*
-@@ -11471,6 +11594,7 @@
+@@ -11471,6 +11603,7 @@
      }
  
@@ -3965 +4127 @@
      msg_scroll = TRUE;
      msg_clr_eos();
-@@ -13250,7 +13374,7 @@
+@@ -13250,7 +13383,7 @@
         if (argvars[2].v_type != VAR_UNKNOWN)
             EMSG2(_(e_toomanyarg), "remove()");
@@ -3974 +4136 @@
             key = get_tv_string_chk(&argvars[1]);
             if (key != NULL)
-@@ -13270,7 +13394,7 @@
+@@ -13270,7 +13403,7 @@
      else if (argvars[0].v_type != VAR_LIST)
         EMSG2(_(e_listdictarg), "remove()");
@@ -3983 +4145 @@
         int         error = FALSE;
  
-@@ -14157,11 +14281,7 @@
+@@ -14157,11 +14290,7 @@
      typval_T   *rettv;
  {
@@ -3995 +4157 @@
      typval_T   *varp;
      char_u     nbuf[NUMBUFLEN];
-@@ -14178,12 +14298,7 @@
+@@ -14178,12 +14307,7 @@
      if (buf != NULL && varname != NULL && varp != NULL)
      {
@@ -4008 +4170 @@
         if (*varname == '&')
         {
-@@ -14210,11 +14325,7 @@
+@@ -14210,11 +14334,7 @@
         }
  
@@ -4020 +4182 @@
  }
  
-@@ -14582,6 +14693,18 @@
+@@ -14582,6 +14702,18 @@
  }
  
@@ -4039 +4201 @@
   */
      static void
-@@ -15950,6 +16073,10 @@
+@@ -15950,6 +16082,10 @@
         }
      }
@@ -4050 +4212 @@
  }
  
-@@ -16173,7 +16300,7 @@
+@@ -16173,7 +16309,7 @@
         curwin->w_curswant = get_dict_number(dict, (char_u *)"curswant");
         curwin->w_set_curswant = FALSE;
@@ -4059 +4221 @@
         curwin->w_topfill = get_dict_number(dict, (char_u *)"topfill");
  #endif
-@@ -16218,6 +16345,7 @@
+@@ -16218,6 +16354,7 @@
  #ifdef FEAT_VIRTUALEDIT
      dict_add_nr_str(dict, "coladd", (long)curwin->w_cursor.coladd, NULL);
@@ -4067 +4229 @@
  
      dict_add_nr_str(dict, "topline", (long)curwin->w_topline, NULL);
-@@ -16438,9 +16566,12 @@
+@@ -16438,9 +16575,12 @@
      long       i = 0;
      long       n;
@@ -4083 +4245 @@
  
      if (fnump != NULL)
-@@ -16466,8 +16597,9 @@
+@@ -16466,8 +16606,9 @@
  #ifdef FEAT_VIRTUALEDIT
      n = list_find_nr(l, i, NULL);
@@ -4095 +4257 @@
  
      return OK;
-@@ -17759,6 +17891,13 @@
+@@ -17759,6 +17900,13 @@
      }
      else                   /* add a new variable */
@@ -4109 +4271 @@
         for (p = varname; *p != NUL; ++p)
             if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p))
-@@ -17792,7 +17931,7 @@
+@@ -17792,7 +17940,7 @@
  }
  
@@ -4118 +4280 @@
   */
      static int
-@@ -17814,6 +17953,23 @@
+@@ -17814,6 +17962,23 @@
  }
  
@@ -4142 +4304 @@
   * Also give an error message, using "name".
   */
-@@ -18396,12 +18552,14 @@
+@@ -18396,12 +18561,14 @@
  
      if (!eap->skip)
@@ -4159 +4321 @@
             if (*arg == K_SPECIAL)
                 j = 3;
-@@ -18786,6 +18944,7 @@
+@@ -18786,6 +18953,7 @@
                 if (dict_add(fudi.fd_dict, fudi.fd_di) == FAIL)
                 {
@@ -4167 +4329 @@
                 }
             }
-@@ -18963,7 +19122,8 @@
+@@ -18963,7 +19131,8 @@
      else if (lead > 0)
      {
@@ -4177 +4339 @@
             /* It's "s:" or "<SID>" */
             if (current_SID <= 0)
-@@ -19618,6 +19778,7 @@
+@@ -19618,6 +19787,7 @@
      char_u     *name;
  #ifdef FEAT_PROFILE
@@ -4185 +4347 @@
  
      /* If depth of calling is getting too high, don't execute the function */
-@@ -19685,6 +19846,7 @@
+@@ -19685,6 +19855,7 @@
      v->di_tv.vval.v_list = &fc.l_varlist;
      vim_memset(&fc.l_varlist, 0, sizeof(list_T));
@@ -4193 +4355 @@
      /*
       * Set a:firstline to "firstline" and a:lastline to "lastline".
-@@ -19761,7 +19923,7 @@
+@@ -19761,7 +19932,7 @@
             if (p_verbose >= 14)
             {
@@ -4202 +4364 @@
  
                 msg_puts((char_u *)"(");
-@@ -19773,8 +19935,8 @@
+@@ -19773,8 +19944,8 @@
                         msg_outnum((long)argvars[i].vval.v_number);
                     else
@@ -4213 +4375 @@
                         vim_free(tofree);
                     }
-@@ -19796,7 +19958,7 @@
+@@ -19796,7 +19967,7 @@
                        || (fc.caller != NULL && &fc.caller->func->uf_profiling))
         {
@@ -4222 +4384 @@
         }
         script_prof_save(&wait_start);
-@@ -19826,14 +19988,14 @@
+@@ -19826,14 +19997,14 @@
      if (do_profiling == PROF_YES && (fp->uf_profiling
                     || (fc.caller != NULL && &fc.caller->func->uf_profiling)))
@@ -4243 +4405 @@
      }
  #endif
-@@ -19852,13 +20014,13 @@
+@@ -19852,13 +20023,13 @@
         else
         {
@@ -4261 +4423 @@
 diff -Naur vim70.orig/src/ex_cmds2.c vim70/src/ex_cmds2.c
 --- vim70.orig/src/ex_cmds2.c   2006-04-17 03:19:07.000000000 -0700
-+++ vim70/src/ex_cmds2.c        2006-12-05 19:57:56.000000000 -0800
-@@ -3648,13 +3648,13 @@
++++ vim70/src/ex_cmds2.c        2007-01-23 17:15:23.000000000 -0800
+@@ -2811,6 +2811,17 @@
+     }
+ 
+ #ifdef FEAT_AUTOCMD
++    /* Apply SourceCmd autocommands, they should get the file and source it. */
++    if (has_autocmd(EVENT_SOURCECMD, fname_exp, NULL)
++           && apply_autocmds(EVENT_SOURCECMD, fname_exp, fname_exp,
++                                                              FALSE, curbuf))
++# ifdef FEAT_EVAL
++       return aborting() ? FAIL : OK;
++# else
++       return OK;
++# endif
++
++    /* Apply SourcePre autocommands, they may get the file. */
+     apply_autocmds(EVENT_SOURCEPRE, fname_exp, fname_exp, FALSE, curbuf);
+ #endif
+ 
+@@ -3648,13 +3659,13 @@
   * Return FALSE when not sourcing a file.
   */
@@ -4282 +4462 @@
 diff -Naur vim70.orig/src/ex_cmds.c vim70/src/ex_cmds.c
 --- vim70.orig/src/ex_cmds.c    2006-04-22 11:56:56.000000000 -0700
-+++ vim70/src/ex_cmds.c 2006-12-05 19:58:00.000000000 -0800
++++ vim70/src/ex_cmds.c 2007-01-23 17:14:59.000000000 -0800
 @@ -95,7 +95,10 @@
                 _("<%s>%s%s  %d,  Hex %02x,  Octal %03o"),
@@ -4393 +4573 @@
 diff -Naur vim70.orig/src/ex_cmds.h vim70/src/ex_cmds.h
 --- vim70.orig/src/ex_cmds.h    2006-04-07 02:44:46.000000000 -0700
-+++ vim70/src/ex_cmds.h 2006-12-05 19:57:46.000000000 -0800
++++ vim70/src/ex_cmds.h 2007-01-23 17:14:49.000000000 -0800
 @@ -262,7 +262,7 @@
  EX(CMD_comclear,       "comclear",     ex_comclear,
@@ -4405 +4585 @@
 diff -Naur vim70.orig/src/ex_docmd.c vim70/src/ex_docmd.c
 --- vim70.orig/src/ex_docmd.c   2006-05-05 09:33:19.000000000 -0700
-+++ vim70/src/ex_docmd.c        2006-12-05 19:58:21.000000000 -0800
++++ vim70/src/ex_docmd.c        2007-01-23 17:15:11.000000000 -0800
 @@ -58,9 +58,9 @@
  #endif
@@ -4868 +5048 @@
 diff -Naur vim70.orig/src/ex_eval.c vim70/src/ex_eval.c
 --- vim70.orig/src/ex_eval.c    2006-04-22 12:22:27.000000000 -0700
-+++ vim70/src/ex_eval.c 2006-12-05 19:58:21.000000000 -0800
++++ vim70/src/ex_eval.c 2007-01-23 17:15:11.000000000 -0800
 @@ -340,7 +340,7 @@
  
@@ -4894 +5074 @@
 diff -Naur vim70.orig/src/ex_getln.c vim70/src/ex_getln.c
 --- vim70.orig/src/ex_getln.c   2006-04-30 08:32:01.000000000 -0700
-+++ vim70/src/ex_getln.c        2006-12-05 19:58:12.000000000 -0800
++++ vim70/src/ex_getln.c        2007-01-23 17:15:10.000000000 -0800
 @@ -34,7 +34,7 @@
      int                xp_context;     /* type of expansion */
@@ -5044 +5224 @@
 diff -Naur vim70.orig/src/fileio.c vim70/src/fileio.c
 --- vim70.orig/src/fileio.c     2006-04-30 08:28:57.000000000 -0700
-+++ vim70/src/fileio.c  2006-12-05 19:58:02.000000000 -0800
++++ vim70/src/fileio.c  2007-01-23 17:15:23.000000000 -0800
 @@ -316,6 +316,9 @@
       * display the line. */
@@ -5055 +5235 @@
       * For Unix: Use the short file name whenever possible.
       * Avoids problems with networks and when directory names are changed.
+@@ -6151,8 +6154,8 @@
+     if (retval != FAIL)
+     {
+        curbuf = frombuf;
+-       while (!bufempty())
+-           if (ml_delete(curbuf->b_ml.ml_line_count, FALSE) == FAIL)
++       for (lnum = curbuf->b_ml.ml_line_count; lnum > 0; --lnum)
++           if (ml_delete(lnum, FALSE) == FAIL)
+            {
+                /* Oops!  We could try putting back the saved lines, but that
+                 * might fail again... */
 @@ -6450,17 +6453,10 @@
      int                old_ro = buf->b_p_ro;
@@ -5096 +5287 @@
      {"InsertEnter",    EVENT_INSERTENTER},
      {"InsertLeave",    EVENT_INSERTLEAVE},
-@@ -8088,6 +8080,7 @@
+@@ -7003,6 +6995,7 @@
+     {"ShellCmdPost",   EVENT_SHELLCMDPOST},
+     {"ShellFilterPost",        EVENT_SHELLFILTERPOST},
+     {"SourcePre",      EVENT_SOURCEPRE},
++    {"SourceCmd",      EVENT_SOURCECMD},
+     {"SpellFileMissing",EVENT_SPELLFILEMISSING},
+     {"StdinReadPost",  EVENT_STDINREADPOST},
+     {"StdinReadPre",   EVENT_STDINREADPRE},
+@@ -8088,6 +8081,7 @@
   * Search a window for the current buffer.  Save the cursor position and
   * screen offset.
@@ -5104 +5303 @@
      void
  aucmd_prepbuf(aco, buf)
-@@ -8151,6 +8144,7 @@
+@@ -8151,6 +8145,7 @@
  /*
   * Cleanup after executing autocommands for a (hidden) buffer.
@@ -5112 +5311 @@
      void
  aucmd_restbuf(aco)
-@@ -8295,7 +8289,11 @@
+@@ -8295,7 +8290,11 @@
  {
      int                state;
@@ -5125 +5324 @@
         state = get_real_state();
         if (state == NORMAL_BUSY || (state & INSERT) != 0)
-@@ -9063,8 +9061,38 @@
+@@ -9063,8 +9062,38 @@
      return retval;
  }
@@ -5166 +5365 @@
 diff -Naur vim70.orig/src/fold.c vim70/src/fold.c
 --- vim70.orig/src/fold.c       2006-04-22 12:35:56.000000000 -0700
-+++ vim70/src/fold.c    2006-12-05 19:58:10.000000000 -0800
++++ vim70/src/fold.c    2007-01-23 17:15:09.000000000 -0800
 @@ -2971,7 +2971,11 @@
      else
@@ -5181 +5380 @@
 diff -Naur vim70.orig/src/getchar.c vim70/src/getchar.c
 --- vim70.orig/src/getchar.c    2006-05-03 10:29:21.000000000 -0700
-+++ vim70/src/getchar.c 2006-12-05 19:58:33.000000000 -0800
++++ vim70/src/getchar.c 2007-01-23 17:15:12.000000000 -0800
 @@ -76,7 +76,7 @@
   */
@@ -5316 +5515 @@
 diff -Naur vim70.orig/src/globals.h vim70/src/globals.h
 --- vim70.orig/src/globals.h    2006-04-30 06:16:23.000000000 -0700
-+++ vim70/src/globals.h 2006-12-05 19:58:06.000000000 -0800
++++ vim70/src/globals.h 2007-01-23 17:15:05.000000000 -0800
 @@ -166,6 +166,7 @@
  EXTERN int     emsg_off INIT(= 0);         /* don't display errors for now,
@@ -5356 +5555 @@
 diff -Naur vim70.orig/src/gui_at_fs.c vim70/src/gui_at_fs.c
 --- vim70.orig/src/gui_at_fs.c  2005-07-09 04:30:17.000000000 -0700
-+++ vim70/src/gui_at_fs.c       2006-12-05 19:57:43.000000000 -0800
++++ vim70/src/gui_at_fs.c       2007-01-23 17:14:47.000000000 -0800
 @@ -1861,27 +1861,27 @@
      XtPointer  pnew;
@@ -5472 +5671 @@
 diff -Naur vim70.orig/src/gui_beval.c vim70/src/gui_beval.c
 --- vim70.orig/src/gui_beval.c  2006-05-04 12:29:51.000000000 -0700
-+++ vim70/src/gui_beval.c       2006-12-05 19:57:56.000000000 -0800
++++ vim70/src/gui_beval.c       2007-01-23 17:14:55.000000000 -0800
 @@ -926,7 +926,7 @@
  #  define IS_NONPRINTABLE(c) (((c) < 0x20 && (c) != TAB && (c) != NL) \
@@ -5511 +5710 @@
 diff -Naur vim70.orig/src/gui.c vim70/src/gui.c
 --- vim70.orig/src/gui.c        2006-05-03 04:00:59.000000000 -0700
-+++ vim70/src/gui.c     2006-12-05 19:58:06.000000000 -0800
++++ vim70/src/gui.c     2007-01-23 17:15:05.000000000 -0800
 @@ -187,9 +187,10 @@
  #endif
@@ -5614 +5813 @@
 diff -Naur vim70.orig/src/gui_gtk.c vim70/src/gui_gtk.c
 --- vim70.orig/src/gui_gtk.c    2006-05-05 04:52:52.000000000 -0700
-+++ vim70/src/gui_gtk.c 2006-12-05 19:58:10.000000000 -0800
++++ vim70/src/gui_gtk.c 2007-01-23 17:15:08.000000000 -0800
 @@ -957,15 +957,15 @@
  get_menu_position(vimmenu_T *menu)
@@ -5712 +5911 @@
 diff -Naur vim70.orig/src/gui_gtk_x11.c vim70/src/gui_gtk_x11.c
 --- vim70.orig/src/gui_gtk_x11.c        2006-05-04 23:58:59.000000000 -0700
-+++ vim70/src/gui_gtk_x11.c     2006-12-05 19:57:56.000000000 -0800
++++ vim70/src/gui_gtk_x11.c     2007-01-23 17:14:55.000000000 -0800
 @@ -3233,12 +3233,12 @@
  on_select_tab(
@@ -5777 +5976 @@
 diff -Naur vim70.orig/src/gui_xmebw.c vim70/src/gui_xmebw.c
 --- vim70.orig/src/gui_xmebw.c  2006-04-30 08:32:32.000000000 -0700
-+++ vim70/src/gui_xmebw.c       2006-12-05 19:58:10.000000000 -0800
++++ vim70/src/gui_xmebw.c       2007-01-23 17:15:08.000000000 -0800
 @@ -47,13 +47,13 @@
  #include "gui_xmebwp.h"
@@ -5906 +6105 @@
 diff -Naur vim70.orig/src/hardcopy.c vim70/src/hardcopy.c
 --- vim70.orig/src/hardcopy.c   2006-05-04 03:09:58.000000000 -0700
-+++ vim70/src/hardcopy.c        2006-12-05 19:57:56.000000000 -0800
++++ vim70/src/hardcopy.c        2007-01-23 17:14:55.000000000 -0800
 @@ -1794,29 +1794,27 @@
      static int
@@ -6009 +6208 @@
 diff -Naur vim70.orig/src/if_cscope.c vim70/src/if_cscope.c
 --- vim70.orig/src/if_cscope.c  2006-04-18 01:54:15.000000000 -0700
-+++ vim70/src/if_cscope.c       2006-12-05 19:58:12.000000000 -0800
-@@ -989,8 +989,7 @@
++++ vim70/src/if_cscope.c       2007-01-23 17:15:15.000000000 -0800
+@@ -627,10 +627,11 @@
+         * If the database is out of date, or there's some other problem,
+         * cscope will output error messages before the number-of-lines output.
+         * Display/discard any output that doesn't match what we want.
++        * Accept "\S*cscope: X lines", also matches "mlcscope".
+         */
+        if ((stok = strtok(buf, (const char *)" ")) == NULL)
+            continue;
+-       if (strcmp((const char *)stok, "cscope:"))
++       if (strstr((const char *)stok, "cscope:") == NULL)
+            continue;
+ 
+        if ((stok = strtok(NULL, (const char *)" ")) == NULL)
+@@ -989,8 +990,7 @@
  {
      int i;
@@ -6020 +6232 @@
      char cmdletter;
      char *qfpos;
-@@ -1009,7 +1008,7 @@
+@@ -1009,7 +1009,7 @@
      totmatches = 0;
      for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
@@ -6029 +6241 @@
  
         /* send cmd to cscope */
-@@ -1101,38 +1100,44 @@
+@@ -1101,38 +1101,44 @@
      if (qfpos != NULL && *qfpos != '0' && totmatches > 0)
      {
@@ -6096 +6308 @@
         mch_remove(tmp);
         vim_free(tmp);
-@@ -1141,6 +1146,9 @@
+@@ -1141,6 +1147,9 @@
      else
  #endif /* FEAT_QUICKFIX */
@@ -6106 +6318 @@
         cs_fill_results((char *)pat, totmatches, nummatches, &matches,
                                                          &contexts, &matched);
-@@ -1721,7 +1729,7 @@
+@@ -1721,7 +1730,7 @@
                continue;
  
@@ -6115 +6327 @@
  
            if (strcmp(cntx, "<global>")==0)
-@@ -1729,7 +1737,7 @@
+@@ -1729,7 +1738,7 @@
            else
                sprintf(context, "<<%s>>", cntx);
@@ -6126 +6338 @@
 diff -Naur vim70.orig/src/if_perl.xs vim70/src/if_perl.xs
 --- vim70.orig/src/if_perl.xs   2006-03-06 10:57:16.000000000 -0800
-+++ vim70/src/if_perl.xs        2006-12-05 19:57:54.000000000 -0800
++++ vim70/src/if_perl.xs        2007-01-23 17:14:52.000000000 -0800
 @@ -155,8 +155,8 @@
  static int (*perl_run)(PerlInterpreter*);
@@ -6241 +6453 @@
 diff -Naur vim70.orig/src/if_python.c vim70/src/if_python.c
 --- vim70.orig/src/if_python.c  2006-04-30 08:31:36.000000000 -0700
-+++ vim70/src/if_python.c       2006-12-05 19:58:04.000000000 -0800
++++ vim70/src/if_python.c       2007-01-23 17:15:02.000000000 -0800
 @@ -1463,7 +1463,7 @@
      if (this->buf && this->buf != INVALID_BUFFER_VALUE)
@@ -6280 +6492 @@
 diff -Naur vim70.orig/src/if_ruby.c vim70/src/if_ruby.c
 --- vim70.orig/src/if_ruby.c    2006-04-30 08:37:52.000000000 -0700
-+++ vim70/src/if_ruby.c 2006-12-05 19:57:54.000000000 -0800
++++ vim70/src/if_ruby.c 2007-01-23 17:14:52.000000000 -0800
 @@ -643,11 +643,14 @@
  
@@ -6395 +6607 @@
 diff -Naur vim70.orig/src/macros.h vim70/src/macros.h
 --- vim70.orig/src/macros.h     2006-03-01 04:01:10.000000000 -0800
-+++ vim70/src/macros.h  2006-12-05 19:58:00.000000000 -0800
++++ vim70/src/macros.h  2007-01-23 17:14:57.000000000 -0800
 @@ -276,3 +276,9 @@
  # define MB_CHARLEN(p)         STRLEN(p)
@@ -6408 +6620 @@
 diff -Naur vim70.orig/src/main.c vim70/src/main.c
 --- vim70.orig/src/main.c       2006-05-03 10:36:44.000000000 -0700
-+++ vim70/src/main.c    2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/main.c    2007-01-23 17:15:10.000000000 -0800
 @@ -564,7 +564,11 @@
       */
@@ -6602 +6814 @@
 diff -Naur vim70.orig/src/Makefile vim70/src/Makefile
 --- vim70.orig/src/Makefile     2006-05-07 06:25:27.000000000 -0700
-+++ vim70/src/Makefile  2006-12-05 19:57:59.000000000 -0800
++++ vim70/src/Makefile  2007-01-23 17:14:56.000000000 -0800
 @@ -2177,6 +2177,7 @@
         cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* .
@@ -6622 +6834 @@
 diff -Naur vim70.orig/src/mbyte.c vim70/src/mbyte.c
 --- vim70.orig/src/mbyte.c      2006-04-30 04:51:01.000000000 -0700
-+++ vim70/src/mbyte.c   2006-12-05 19:58:39.000000000 -0800
++++ vim70/src/mbyte.c   2007-01-23 17:15:12.000000000 -0800
 @@ -311,7 +311,11 @@
  
@@ -6719 +6931 @@
 diff -Naur vim70.orig/src/memfile.c vim70/src/memfile.c
 --- vim70.orig/src/memfile.c    2006-03-06 00:59:15.000000000 -0800
-+++ vim70/src/memfile.c 2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/memfile.c 2007-01-23 17:15:10.000000000 -0800
 @@ -517,7 +517,7 @@
         mf_ins_free(mfp, hp);   /* put *hp in the free list */
@@ -6776 +6988 @@
 diff -Naur vim70.orig/src/memline.c vim70/src/memline.c
 --- vim70.orig/src/memline.c    2006-04-20 14:00:21.000000000 -0700
-+++ vim70/src/memline.c 2006-12-05 19:58:12.000000000 -0800
++++ vim70/src/memline.c 2007-01-23 17:15:12.000000000 -0800
 @@ -215,7 +215,7 @@
  #define ML_FLUSH       0x02        /* flush locked block */
@@ -6807 +7019 @@
         else
             set_b0_dir_flag(b0p, buf);
-@@ -1325,6 +1325,7 @@
+@@ -1325,7 +1325,11 @@
             mf_put(mfp, hp, FALSE, FALSE);
         mf_close(mfp, FALSE);       /* will also vim_free(mfp->mf_fname) */
      }
-+    vim_free(buf->b_ml.ml_stack);
-     vim_free(buf);
+-    vim_free(buf);
++    if (buf != NULL)
++    {
++       vim_free(buf->b_ml.ml_stack);
++       vim_free(buf);
++    }
      if (serious_error && called_from_main)
         ml_close(curbuf, TRUE);
-@@ -1633,6 +1634,7 @@
+ #ifdef FEAT_AUTOCMD
+@@ -1633,6 +1637,7 @@
      int                    fd;
      struct block0   b0;
@@ -6823 +7040 @@
      char_u         uname[B0_UNAME_SIZE];
  #endif
-@@ -1652,8 +1654,11 @@
+@@ -1652,8 +1657,11 @@
  #endif
             MSG_PUTS(_("             dated: "));
@@ -6837 +7054 @@
  
      /*
-@@ -3652,6 +3657,7 @@
+@@ -3652,6 +3660,7 @@
  {
      struct stat st;
@@ -6845 +7062 @@
      ++no_wait_return;
      (void)EMSG(_("E325: ATTENTION"));
-@@ -3666,7 +3672,11 @@
+@@ -3666,7 +3675,11 @@
      {
         MSG_PUTS(_("             dated: "));
@@ -6860 +7077 @@
 diff -Naur vim70.orig/src/menu.c vim70/src/menu.c
 --- vim70.orig/src/menu.c       2006-05-03 10:30:48.000000000 -0700
-+++ vim70/src/menu.c    2006-12-05 19:58:28.000000000 -0800
++++ vim70/src/menu.c    2007-01-23 17:15:12.000000000 -0800
 @@ -511,6 +511,14 @@
          * name (without mnemonic and accelerator text). */
@@ -6946 +7163 @@
 diff -Naur vim70.orig/src/message.c vim70/src/message.c
 --- vim70.orig/src/message.c    2006-05-06 13:07:37.000000000 -0700
-+++ vim70/src/message.c 2006-12-05 19:58:06.000000000 -0800
++++ vim70/src/message.c 2007-01-23 17:15:17.000000000 -0800
 @@ -53,7 +53,6 @@
  static struct msg_hist *first_msg_hist = NULL;
@@ -6955 +7172 @@
  /*
   * When writing messages to the screen, there are many different situations.
-@@ -1925,7 +1924,8 @@
+@@ -1557,7 +1556,7 @@
+     int                c_extra = 0;
+     char_u     *p_extra = NULL;            /* init to make SASC shut up */
+     int                n;
+-    int                attr= 0;
++    int                attr = 0;
+     char_u     *trail = NULL;
+ #ifdef FEAT_MBYTE
+     int                l;
+@@ -1582,7 +1581,7 @@
+ 
+     while (!got_int)
+     {
+-       if (n_extra)
++       if (n_extra > 0)
+        {
+            --n_extra;
+            if (c_extra)
+@@ -1596,7 +1595,7 @@
+            col += (*mb_ptr2cells)(s);
+            mch_memmove(buf, s, (size_t)l);
+            buf[l] = NUL;
+-           msg_puts_attr(buf, attr);
++           msg_puts(buf);
+            s += l;
+            continue;
+        }
+@@ -1636,6 +1635,9 @@
+                p_extra = transchar_byte(c);
+                c_extra = NUL;
+                c = *p_extra++;
++               /* Use special coloring to be able to distinguish <hex> from
++                * the same in plain text. */
++               attr = hl_attr(HLF_8);
+            }
+            else if (c == ' ' && trail != NULL && s > trail)
+            {
+@@ -1925,7 +1927,8 @@
              * If screen is completely filled and 'more' is set then wait
              * for a character.
@@ -6965 +7219 @@
             {
  #ifdef FEAT_CON_DIALOG
-@@ -4123,8 +4123,6 @@
+@@ -4123,8 +4126,6 @@
             case 'c':
             case 's':
@@ -6974 +7228 @@
                 switch (fmt_spec)
                 {
-@@ -4175,15 +4173,16 @@
+@@ -4175,15 +4176,16 @@
                         str_arg_l = 0;
                     else
@@ -6999 +7253 @@
 diff -Naur vim70.orig/src/misc1.c vim70/src/misc1.c
 --- vim70.orig/src/misc1.c      2006-04-30 08:30:02.000000000 -0700
-+++ vim70/src/misc1.c   2006-12-05 19:58:10.000000000 -0800
++++ vim70/src/misc1.c   2007-01-23 17:15:07.000000000 -0800
 @@ -1761,15 +1761,13 @@
       * Add column offset for 'number', 'foldcolumn', etc.
@@ -7114 +7368 @@
 diff -Naur vim70.orig/src/misc2.c vim70/src/misc2.c
 --- vim70.orig/src/misc2.c      2006-05-04 05:12:38.000000000 -0700
-+++ vim70/src/misc2.c   2006-12-05 19:58:04.000000000 -0800
++++ vim70/src/misc2.c   2007-01-23 17:15:02.000000000 -0800
 @@ -1229,6 +1229,94 @@
      return escaped_string;
@@ -7212 +7466 @@
 diff -Naur vim70.orig/src/netbeans.c vim70/src/netbeans.c
 --- vim70.orig/src/netbeans.c   2006-04-22 11:00:05.000000000 -0700
-+++ vim70/src/netbeans.c        2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/netbeans.c        2007-01-23 17:15:10.000000000 -0800
 @@ -61,7 +61,7 @@
  
@@ -7421 +7675 @@
 diff -Naur vim70.orig/src/normal.c vim70/src/normal.c
 --- vim70.orig/src/normal.c     2006-04-29 06:11:18.000000000 -0700
-+++ vim70/src/normal.c  2006-12-05 19:58:33.000000000 -0800
++++ vim70/src/normal.c  2007-01-23 17:15:12.000000000 -0800
 @@ -651,9 +651,8 @@
         /* Fake a "c"hange command.  When "restart_edit" is set (e.g., because
@@ -7520 +7774 @@
 diff -Naur vim70.orig/src/ops.c vim70/src/ops.c
 --- vim70.orig/src/ops.c        2006-04-30 08:13:44.000000000 -0700
-+++ vim70/src/ops.c     2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/ops.c     2007-01-23 17:15:10.000000000 -0800
 @@ -95,8 +95,8 @@
  static void block_insert __ARGS((oparg_T *oap, char_u *s, int b_insert, struct block_def*bdp));
@@ -7720 +7974 @@
 diff -Naur vim70.orig/src/option.c vim70/src/option.c
 --- vim70.orig/src/option.c     2006-05-03 10:32:28.000000000 -0700
-+++ vim70/src/option.c  2006-12-05 19:58:09.000000000 -0800
++++ vim70/src/option.c  2007-01-23 17:15:07.000000000 -0800
 @@ -2294,7 +2294,7 @@
                             {(char_u *)0L, (char_u *)0L}
@@ -7836 +8090 @@
 diff -Naur vim70.orig/src/os_unix.c vim70/src/os_unix.c
 --- vim70.orig/src/os_unix.c    2006-05-01 01:13:15.000000000 -0700
-+++ vim70/src/os_unix.c 2006-12-05 19:57:56.000000000 -0800
++++ vim70/src/os_unix.c 2007-01-23 17:14:55.000000000 -0800
 @@ -3934,7 +3934,7 @@
                     {
@@ -7895 +8149 @@
 diff -Naur vim70.orig/src/popupmnu.c vim70/src/popupmnu.c
 --- vim70.orig/src/popupmnu.c   2006-04-20 13:18:37.000000000 -0700
-+++ vim70/src/popupmnu.c        2006-12-05 19:57:54.000000000 -0800
++++ vim70/src/popupmnu.c        2007-01-23 17:14:53.000000000 -0800
 @@ -552,6 +552,9 @@
  {
@@ -7908 +8162 @@
 diff -Naur vim70.orig/src/proto/buffer.pro vim70/src/proto/buffer.pro
 --- vim70.orig/src/proto/buffer.pro     2006-05-07 06:08:29.000000000 -0700
-+++ vim70/src/proto/buffer.pro  2006-12-05 19:58:00.000000000 -0800
++++ vim70/src/proto/buffer.pro  2007-01-23 17:14:57.000000000 -0800
 @@ -10,6 +10,7 @@
  extern int do_buffer __ARGS((int action, int start, int dir, int count, int forceit));
@@ -7919 +8173 @@
 diff -Naur vim70.orig/src/proto/eval.pro vim70/src/proto/eval.pro
 --- vim70.orig/src/proto/eval.pro       2006-05-07 06:08:33.000000000 -0700
-+++ vim70/src/proto/eval.pro    2006-12-05 19:58:07.000000000 -0800
++++ vim70/src/proto/eval.pro    2007-01-23 17:15:06.000000000 -0800
 @@ -44,7 +44,7 @@
  extern char_u *get_user_var_name __ARGS((expand_T *xp, int idx));
@@ -7931 +8185 @@
 diff -Naur vim70.orig/src/proto/menu.pro vim70/src/proto/menu.pro
 --- vim70.orig/src/proto/menu.pro       2006-05-07 06:08:51.000000000 -0700
-+++ vim70/src/proto/menu.pro    2006-12-05 19:57:54.000000000 -0800
++++ vim70/src/proto/menu.pro    2007-01-23 17:14:53.000000000 -0800
 @@ -10,6 +10,7 @@
  extern int menu_is_child_of_popup __ARGS((vimmenu_T *menu));
@@ -7942 +8196 @@
 diff -Naur vim70.orig/src/proto/misc2.pro vim70/src/proto/misc2.pro
 --- vim70.orig/src/proto/misc2.pro      2006-05-07 06:08:54.000000000 -0700
-+++ vim70/src/proto/misc2.pro   2006-12-05 19:58:04.000000000 -0800
++++ vim70/src/proto/misc2.pro   2007-01-23 17:15:02.000000000 -0800
 @@ -29,6 +29,7 @@
  extern char_u *vim_strnsave __ARGS((char_u *string, int len));
@@ -7953 +8207 @@
 diff -Naur vim70.orig/src/proto/ops.pro vim70/src/proto/ops.pro
 --- vim70.orig/src/proto/ops.pro        2006-05-07 06:08:58.000000000 -0700
-+++ vim70/src/proto/ops.pro     2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/proto/ops.pro     2007-01-23 17:15:10.000000000 -0800
 @@ -17,10 +17,10 @@
  extern void put_register __ARGS((int name, void *reg));
@@ -7969 +8223 @@
 diff -Naur vim70.orig/src/proto/undo.pro vim70/src/proto/undo.pro
 --- vim70.orig/src/proto/undo.pro       2006-05-07 06:09:11.000000000 -0700
-+++ vim70/src/proto/undo.pro    2006-12-05 19:57:47.000000000 -0800
++++ vim70/src/proto/undo.pro    2007-01-23 17:14:49.000000000 -0800
 @@ -4,6 +4,7 @@
  extern int u_savesub __ARGS((linenr_T lnum));
@@ -7980 +8234 @@
 diff -Naur vim70.orig/src/quickfix.c vim70/src/quickfix.c
 --- vim70.orig/src/quickfix.c   2006-05-03 00:47:42.000000000 -0700
-+++ vim70/src/quickfix.c        2006-12-05 19:58:09.000000000 -0800
++++ vim70/src/quickfix.c        2007-01-23 17:15:07.000000000 -0800
 @@ -500,8 +500,6 @@
         {
@@ -8235 +8489 @@
 diff -Naur vim70.orig/src/regexp.c vim70/src/regexp.c
 --- vim70.orig/src/regexp.c     2006-04-30 08:31:50.000000000 -0700
-+++ vim70/src/regexp.c  2006-12-05 19:58:09.000000000 -0800
++++ vim70/src/regexp.c  2007-01-23 17:15:07.000000000 -0800
 @@ -3777,8 +3777,8 @@
  
@@ -8372 +8626 @@
 diff -Naur vim70.orig/src/screen.c vim70/src/screen.c
 --- vim70.orig/src/screen.c     2006-05-05 03:13:55.000000000 -0700
-+++ vim70/src/screen.c  2006-12-05 19:58:12.000000000 -0800
++++ vim70/src/screen.c  2007-01-23 17:15:11.000000000 -0800
 @@ -455,6 +455,7 @@
                     && curwin->w_topline == curwin->w_lines[0].wl_lnum)
@@ -8556 +8810 @@
 diff -Naur vim70.orig/src/search.c vim70/src/search.c
 --- vim70.orig/src/search.c     2006-05-05 05:12:13.000000000 -0700
-+++ vim70/src/search.c  2006-12-05 19:58:06.000000000 -0800
-@@ -1259,7 +1259,7 @@
++++ vim70/src/search.c  2007-01-23 17:15:26.000000000 -0800
+@@ -812,7 +812,11 @@
+ #ifdef FEAT_MBYTE
+                        if (has_mbyte)
+                        {
+-                           ptr = ml_get_buf(buf, pos->lnum, FALSE);
++                           /* 'e' offset may put us just below the last line */
++                           if (pos->lnum > buf->b_ml.ml_line_count)
++                               ptr = (char_u *)"";
++                           else
++                               ptr = ml_get_buf(buf, pos->lnum, FALSE);
+                            pos->col -= (*mb_head_off)(ptr, ptr + pos->col);
+                        }
+ #endif
+@@ -1259,7 +1263,7 @@
         /*
          * Add character and/or line offset
@@ -8566 +8833 @@
             if (spats[0].off.line)      /* Add the offset to the line number. */
             {
-@@ -4688,6 +4688,7 @@
+@@ -4688,6 +4692,7 @@
  #ifdef FEAT_INS_EXPAND
                     if (action == ACTION_EXPAND)
@@ -8574 +8841 @@
                                 _("Scanning included file: %s"),
                                 (char *)new_fname);
-@@ -4826,15 +4827,20 @@
+@@ -4826,15 +4831,20 @@
  
                 if ((compl_cont_status & CONT_ADDING) && i == compl_length)
@@ -8602 +8869 @@
  
                     /* we read a line, set "already" to check this "line" later
-@@ -4871,7 +4877,7 @@
+@@ -4871,7 +4881,7 @@
                         goto exit_matched;
                 }
@@ -8613 +8880 @@
 diff -Naur vim70.orig/src/spell.c vim70/src/spell.c
 --- vim70.orig/src/spell.c      2006-05-05 00:49:58.000000000 -0700
-+++ vim70/src/spell.c   2006-12-05 19:58:02.000000000 -0800
++++ vim70/src/spell.c   2007-01-23 17:15:01.000000000 -0800
 @@ -1483,7 +1483,7 @@
             else if ((mode == FIND_COMPOUND || mode == FIND_KEEPCOMPOUND
@@ -8944 +9211 @@
 diff -Naur vim70.orig/src/structs.h vim70/src/structs.h
 --- vim70.orig/src/structs.h    2006-04-09 10:57:46.000000000 -0700
-+++ vim70/src/structs.h 2006-12-05 19:57:54.000000000 -0800
++++ vim70/src/structs.h 2007-01-23 17:14:52.000000000 -0800
 @@ -2213,18 +2213,20 @@
  
@@ -8970 +9237 @@
 diff -Naur vim70.orig/src/syntax.c vim70/src/syntax.c
 --- vim70.orig/src/syntax.c     2006-04-26 05:49:45.000000000 -0700
-+++ vim70/src/syntax.c  2006-12-05 19:58:10.000000000 -0800
++++ vim70/src/syntax.c  2007-01-23 17:15:09.000000000 -0800
 @@ -977,6 +977,7 @@
  {
@@ -9074 +9341 @@
 diff -Naur vim70.orig/src/tag.c vim70/src/tag.c
 --- vim70.orig/src/tag.c        2006-04-27 06:11:21.000000000 -0700
-+++ vim70/src/tag.c     2006-12-05 19:58:07.000000000 -0800
++++ vim70/src/tag.c     2007-01-23 17:15:06.000000000 -0800
 @@ -911,7 +911,7 @@
  
@@ -9116 +9383 @@
 diff -Naur vim70.orig/src/term.c vim70/src/term.c
 --- vim70.orig/src/term.c       2006-05-03 10:34:57.000000000 -0700
-+++ vim70/src/term.c    2006-12-05 19:58:10.000000000 -0800
++++ vim70/src/term.c    2007-01-23 17:15:08.000000000 -0800
 @@ -3137,25 +3137,32 @@
             screenalloc(FALSE);
@@ -9180 +9447 @@
 diff -Naur vim70.orig/src/testdir/test56.in vim70/src/testdir/test56.in
 --- vim70.orig/src/testdir/test56.in    2005-05-18 08:37:37.000000000 -0700
-+++ vim70/src/testdir/test56.in 2006-12-05 19:58:00.000000000 -0800
++++ vim70/src/testdir/test56.in 2007-01-23 17:14:57.000000000 -0800
 @@ -3,7 +3,7 @@
  STARTTEST
@@ -9192 +9459 @@
 diff -Naur vim70.orig/src/ui.c vim70/src/ui.c
 --- vim70.orig/src/ui.c 2006-03-27 11:15:09.000000000 -0800
-+++ vim70/src/ui.c      2006-12-05 19:57:56.000000000 -0800
++++ vim70/src/ui.c      2007-01-23 17:14:55.000000000 -0800
 @@ -1137,7 +1137,6 @@
      int                len;
@@ -9212 +9479 @@
 diff -Naur vim70.orig/src/undo.c vim70/src/undo.c
 --- vim70.orig/src/undo.c       2006-04-21 02:30:59.000000000 -0700
-+++ vim70/src/undo.c    2006-12-05 19:57:56.000000000 -0800
++++ vim70/src/undo.c    2007-01-23 17:15:12.000000000 -0800
 @@ -84,7 +84,6 @@
  static void u_unch_branch __ARGS((u_header_T *uhp));
@@ -9230 +9497 @@
  {
      /* Don't allow changes when 'modifiable' is off.  */
-@@ -1188,7 +1187,7 @@
+@@ -342,11 +341,15 @@
+        uhp->uh_alt_next = old_curhead;
+        if (old_curhead != NULL)
+        {
++           uhp->uh_alt_prev = old_curhead->uh_alt_prev;
++           if (uhp->uh_alt_prev != NULL)
++               uhp->uh_alt_prev->uh_alt_next = uhp;
+            old_curhead->uh_alt_prev = uhp;
+            if (curbuf->b_u_oldhead == old_curhead)
+                curbuf->b_u_oldhead = uhp;
+        }
+-       uhp->uh_alt_prev = NULL;
++       else
++           uhp->uh_alt_prev = NULL;
+        if (curbuf->b_u_newhead != NULL)
+            curbuf->b_u_newhead->uh_prev = uhp;
+ 
+@@ -857,6 +860,11 @@
+        uhp = curbuf->b_u_curhead;
+        while (uhp != NULL)
+        {
++           /* Go back to the first branch with a mark. */
++           while (uhp->uh_alt_prev != NULL
++                                       && uhp->uh_alt_prev->uh_walk == mark)
++               uhp = uhp->uh_alt_prev;
++
+            /* Find the last branch with a mark, that's the one. */
+            last = uhp;
+            while (last->uh_alt_next != NULL
+@@ -866,6 +874,8 @@
+            {
+                /* Make the used branch the first entry in the list of
+                 * alternatives to make "u" and CTRL-R take this branch. */
++               while (uhp->uh_alt_prev != NULL)
++                   uhp = uhp->uh_alt_prev;
+                if (last->uh_alt_next != NULL)
+                    last->uh_alt_next->uh_alt_prev = last->uh_alt_prev;
+                last->uh_alt_prev->uh_alt_next = last->uh_alt_next;
+@@ -1188,7 +1198,7 @@
      int                did_undo;       /* just did an undo */
      int                absolute;       /* used ":undo N" */
@@ -9239 +9544 @@
      char_u     msgbuf[80];
  
-@@ -1206,20 +1205,20 @@
+@@ -1206,20 +1216,20 @@
  
      u_oldcount -= u_newcount;
@@ -9266 +9571 @@
  
      if (curbuf->b_u_curhead != NULL)
-@@ -1245,7 +1244,7 @@
+@@ -1245,7 +1255,7 @@
  
      smsg((char_u *)_("%ld %s; %s #%ld  %s"),
@@ -9277 +9582 @@
 diff -Naur vim70.orig/src/version.c vim70/src/version.c
 --- vim70.orig/src/version.c    2006-05-03 00:50:42.000000000 -0700
-+++ vim70/src/version.c 2006-12-05 19:58:39.000000000 -0800
-@@ -667,6 +667,328 @@
++++ vim70/src/version.c 2007-01-23 17:15:26.000000000 -0800
+@@ -667,6 +667,346 @@
  static int included_patches[] =
  {   /* Add new patch number below this line */
  /**/
++    188,
++/**/
++    187,
++/**/
++    186,
++/**/
++    185,
++/**/
++    184,
++/**/
++    183,
++/**/
++    182,
++/**/
++    181,
++/**/
++    179,
++/**/
 +    178,
 +/**/
@@ -9607 +9930 @@
  };
  
-@@ -731,7 +1053,11 @@
+@@ -731,7 +1071,11 @@
      /* Only MS VC 4.1 and earlier can do Win32s */
      MSG_PUTS(_("\nMS-Windows 16/32 bit GUI version"));
@@ -9621 +9944 @@
 diff -Naur vim70.orig/src/vim.h vim70/src/vim.h
 --- vim70.orig/src/vim.h        2006-04-30 08:32:38.000000000 -0700
-+++ vim70/src/vim.h     2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/vim.h     2007-01-23 17:15:23.000000000 -0800
 @@ -585,7 +585,6 @@
  #define INSERT         0x10    /* Insert mode */
@@ -9640 +9963 @@
  #define FORWARD                        1
  #define BACKWARD               (-1)
+@@ -1100,7 +1102,7 @@
+     EVENT_COLORSCHEME,         /* after loading a colorscheme */
+     EVENT_FILEAPPENDPOST,      /* after appending to a file */
+     EVENT_FILEAPPENDPRE,       /* before appending to a file */
+-    EVENT_FILEAPPENDCMD,       /* appende to a file using command */
++    EVENT_FILEAPPENDCMD,       /* append to a file using command */
+     EVENT_FILECHANGEDSHELL,    /* after shell command that changed file */
+     EVENT_FILECHANGEDSHELLPOST,        /* after (not) reloading changed file */
+     EVENT_FILECHANGEDRO,       /* before first change to read-only file */
 @@ -1118,6 +1120,7 @@
      EVENT_FOCUSGAINED,         /* got the focus */
@@ -9648 +9980 @@
      EVENT_INSERTENTER,         /* when entering Insert mode */
      EVENT_INSERTLEAVE,         /* when leaving Insert mode */
-@@ -1666,7 +1669,10 @@
+@@ -1144,6 +1147,7 @@
+     EVENT_REMOTEREPLY,         /* upon string reception from a remote vim */
+     EVENT_SWAPEXISTS,          /* found existing swap file */
+     EVENT_SOURCEPRE,           /* before sourcing a Vim script */
++    EVENT_SOURCECMD,           /* sourcing a Vim script using command */
+     EVENT_SPELLFILEMISSING,    /* spell file missing */
+     EVENT_CURSORMOVED,         /* cursor was moved */
+     EVENT_CURSORMOVEDI,                /* cursor was moved in Insert mode */
+@@ -1666,7 +1670,10 @@
  #define VV_SWAPCHOICE  46
  #define VV_SWAPCOMMAND 47
@@ -9662 +10002 @@
 diff -Naur vim70.orig/src/window.c vim70/src/window.c
 --- vim70.orig/src/window.c     2006-05-06 03:54:51.000000000 -0700
-+++ vim70/src/window.c  2006-12-05 19:58:12.000000000 -0800
++++ vim70/src/window.c  2007-01-23 17:15:11.000000000 -0800
 @@ -340,10 +340,10 @@
                 {