Changeset 1f22c7c

Timestamp:

Dec 30, 2008, 4:23:48 PM (16 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

893ca261

Parents:

06dcdf6

Message:

Update VIM Patch to -3

Files:

• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/vim-7.2-branch_update-3.patch (moved) (moved from patches/vim-7.2-branch_update-2.patch ) (102 diffs)

BOOK/introduction/common/changelog.xml

@@ -36 +36 @@
     </listitem>
 -->
+
+    <listitem>
+      <para>December 30, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jim] - Updated Vim Patch to -3.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>

BOOK/patches.ent

@@ -69 +69 @@
 <!ENTITY readline-fixes-patch-size "24 KB">
 
-<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-2.patch">
-<!ENTITY vim-branch_update-patch-md5 "907803cbb34d217b9522aaf4c6024632">
-<!ENTITY vim-branch_update-patch-size "152 KB">
+<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-3.patch">
+<!ENTITY vim-branch_update-patch-md5 "8a08f1a9562183a0214595c915565078">
+<!ENTITY vim-branch_update-patch-size "168 KB">
 
 <!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">

patches/vim-7.2-branch_update-3.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 12-20-2008
+Date: 12-30-2008
 Initial Package Version: 7.2
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 7.2.069
+Description: Contains all upstream patches up to 7.2.076
              The following patches were skipped
-             007 036 041 049
+             007 036 041 049 071 072 074
 
 diff -Naur vim72.orig/Filelist vim72/Filelist
 --- vim72.orig/Filelist 2008-07-06 11:02:23.000000000 -0700
-+++ vim72/Filelist      2008-12-20 15:00:39.000000000 -0800
++++ vim72/Filelist      2008-12-30 16:15:18.000000000 -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       2008-12-20 15:01:04.000000000 -0800
++++ vim72/runtime/doc/cmdline.txt       2008-12-30 16:15:47.000000000 -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  2008-12-20 15:02:44.000000000 -0800
++++ vim72/runtime/doc/eval.txt  2008-12-30 16:17:36.000000000 -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/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       2008-12-20 15:02:01.000000000 -0800
++++ vim72/runtime/doc/options.txt       2008-12-30 16:16:50.000000000 -0800
 @@ -1,4 +1,4 @@
 -*options.txt*  For Vim version 7.2.  Last change: 2008 Aug 06
@@ -220 +220 @@
 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 2008-12-20 15:02:27.000000000 -0800
++++ vim72/runtime/doc/spell.txt 2008-12-30 16:17:18.000000000 -0800
 @@ -1,4 +1,4 @@
 -*spell.txt*    For Vim version 7.2.  Last change: 2008 Jun 21
@@ -350 +350 @@
 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      2008-12-20 15:01:04.000000000 -0800
++++ vim72/runtime/doc/starting.txt      2008-12-30 16:15:47.000000000 -0800
 @@ -1,4 +1,4 @@
 -*starting.txt*  For Vim version 7.2.  Last change: 2008 Jun 21
@@ -412 +412 @@
 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        2008-12-20 15:01:04.000000000 -0800
++++ vim72/runtime/doc/usr_21.txt        2008-12-30 16:15:47.000000000 -0800
 @@ -1,4 +1,4 @@
 -*usr_21.txt*   For Vim version 7.2.  Last change: 2007 May 01
@@ -479 +479 @@
 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   2008-12-20 14:59:55.000000000 -0800
++++ vim72/runtime/scripts.vim   2008-12-30 16:14:26.000000000 -0800
 @@ -234,6 +234,10 @@
    elseif s:line1 =~ '\<DTD\s\+XHTML\s'
@@ -493 +493 @@
 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    2008-12-20 15:01:40.000000000 -0800
++++ vim72/src/auto/configure    2008-12-30 16:16:27.000000000 -0800
 @@ -16819,21 +16819,29 @@
    LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
@@ -534 +534 @@
 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  2008-12-20 15:02:33.000000000 -0800
++++ vim72/src/buffer.c  2008-12-30 16:17:24.000000000 -0800
 @@ -647,6 +647,9 @@
      vim_free(buf->b_start_fenc);
@@ -610 +610 @@
 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      2008-12-20 15:01:40.000000000 -0800
++++ vim72/src/configure.in      2008-12-30 16:16:27.000000000 -0800
 @@ -3152,18 +3152,25 @@
  dnl But only when making dependencies, cproto and lint don't take "-isystem".
@@ -645 +645 @@
 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    2008-12-20 15:02:24.000000000 -0800
++++ vim72/src/diff.c    2008-12-30 16:17:15.000000000 -0800
 @@ -73,6 +73,8 @@
         {
@@ -735 +735 @@
 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    2008-12-20 15:02:44.000000000 -0800
-@@ -348,6 +348,7 @@
++++ vim72/src/eval.c    2008-12-30 16:17:49.000000000 -0800
+@@ -32,6 +32,9 @@
+ 
+ #define DICT_MAXNEST 100       /* maximum nesting of lists and dicts */
+ 
++#define DO_NOT_FREE_CNT 99999  /* refcount for dict or list that should not
++                                  be freed. */
++
+ /*
+  * In a hashtab item "hi_key" points to "di_key" in a dictitem.
+  * This avoids adding a pointer to the hashtab item.
+@@ -348,6 +351,7 @@
      {VV_NAME("mouse_col",       VAR_NUMBER), 0},
      {VV_NAME("operator",        VAR_STRING), VV_RO},
@@ -744 +754 @@
  
  /* shorthand */
-@@ -355,6 +356,7 @@
+@@ -355,6 +359,7 @@
  #define vv_nr          vv_di.di_tv.vval.v_number
  #define vv_float       vv_di.di_tv.vval.v_float
@@ -752 +762 @@
  
  /*
-@@ -426,7 +428,6 @@
+@@ -426,7 +431,6 @@
  static long list_idx_of_item __ARGS((list_T *l, listitem_T *item));
  static void list_append __ARGS((list_T *l, listitem_T *item));
@@ -760 +770 @@
  static int list_insert_tv __ARGS((list_T *l, typval_T *tv, listitem_T *item));
  static int list_extend __ARGS((list_T  *l1, list_T *l2, listitem_T *bef));
-@@ -845,11 +846,17 @@
+@@ -788,6 +792,8 @@
+ static void func_unref __ARGS((char_u *name));
+ static void func_ref __ARGS((char_u *name));
+ static void call_user_func __ARGS((ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rettv, linenr_T firstline, linenr_T lastline, dict_T *selfdict));
++static int can_free_funccal __ARGS((funccall_T *fc, int copyID)) ;
++static void free_funccal __ARGS((funccall_T *fc, int free_val));
+ static void add_nr_var __ARGS((dict_T *dp, dictitem_T *v, char *name, varnumber_T nr));
+ static win_T *find_win_by_nr __ARGS((typval_T *vp, tabpage_T *tp));
+ static void getwinvar __ARGS((typval_T *argvars, typval_T *rettv, int off));
+@@ -845,11 +851,17 @@
         p = &vimvars[i];
         if (p->vv_di.di_tv.v_type == VAR_STRING)
@@ -780 +799 @@
  
      /* script-local variables */
-@@ -1256,23 +1263,26 @@
+@@ -916,6 +928,10 @@
+ /* pointer to funccal for currently active function */
+ funccall_T *current_funccal = NULL;
+ 
++/* pointer to list of previously used funccal, still around because some
++ * item in it is still being used. */
++funccall_T *previous_funccal = NULL;
++
+ /*
+  * Return TRUE when a function was ended by a ":return" command.
+  */
+@@ -1256,23 +1272,26 @@
  
  /*
@@ -810 +840 @@
             ga_init2(&ga, (int)sizeof(char), 80);
             if (tv.vval.v_list != NULL)
-@@ -1280,6 +1290,13 @@
+@@ -1280,6 +1299,13 @@
             ga_append(&ga, NUL);
             retval = (char_u *)ga.ga_data;
@@ -824 +854 @@
             retval = vim_strsave(get_tv_string(&tv));
         clear_tv(&tv);
-@@ -3277,7 +3294,7 @@
+@@ -3277,7 +3303,7 @@
  
      if (*startarg != '(')
@@ -833 +863 @@
      }
  
-@@ -3657,8 +3674,8 @@
+@@ -3657,8 +3683,8 @@
  }
  
@@ -844 +874 @@
      static int
  tv_islocked(tv)
-@@ -6047,6 +6064,25 @@
+@@ -6047,6 +6073,25 @@
  }
  
@@ -870 +900 @@
   * Returns -1 when "item" is not in the list.
   */
-@@ -6137,7 +6173,7 @@
+@@ -6137,7 +6182,7 @@
   * When "len" >= 0 use "str[len]".
   * Returns FAIL when out of memory.
@@ -879 +909 @@
      list_T     *l;
      char_u     *str;
-@@ -6497,6 +6533,9 @@
+@@ -6454,7 +6499,7 @@
+     buf_T      *buf;
+     win_T      *wp;
+     int                i;
+-    funccall_T *fc;
++    funccall_T *fc, **pfc;
+     int                did_free = FALSE;
+ #ifdef FEAT_WINDOWS
+     tabpage_T  *tp;
+@@ -6497,6 +6542,9 @@
         set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID);
      }
@@ -889 +928 @@
       * 2. Go through the list of dicts and free items without the copyID.
       */
-@@ -6587,7 +6626,7 @@
+@@ -6535,6 +6583,20 @@
+        else
+            ll = ll->lv_used_next;
+ 
++    /* check if any funccal can be freed now */
++    for (pfc = &previous_funccal; *pfc != NULL; )
++    {
++       if (can_free_funccal(*pfc, copyID))
++       {
++           fc = *pfc;
++           *pfc = fc->caller;
++           free_funccal(fc, TRUE);
++           did_free = TRUE;
++       }
++       else
++           pfc = &(*pfc)->caller;
++    }
++
+     return did_free;
+ }
+ 
+@@ -6587,7 +6649,7 @@
      {
         case VAR_DICT:
@@ -898 +958 @@
                 /* Didn't see this dict yet. */
                 dd->dv_copyID = copyID;
-@@ -6597,7 +6636,7 @@
+@@ -6597,7 +6659,7 @@
  
         case VAR_LIST:
@@ -907 +967 @@
                 /* Didn't see this list yet. */
                 ll->lv_copyID = copyID;
-@@ -7525,8 +7564,8 @@
+@@ -7525,8 +7587,8 @@
      {"getwinposx",     0, 0, f_getwinposx},
      {"getwinposy",     0, 0, f_getwinposy},
@@ -918 +978 @@
      {"has_key",                2, 2, f_has_key},
      {"haslocaldir",    0, 0, f_haslocaldir},
-@@ -9518,7 +9557,7 @@
+@@ -9518,7 +9580,7 @@
      else
      {
@@ -927 +987 @@
                                     && get_tv_number_chk(&argvars[1], &error))
             flags |= WILD_KEEP_ALL;
-@@ -10300,7 +10339,8 @@
+@@ -10300,7 +10362,8 @@
      s = get_tv_string(&argvars[0]);
      if (s == NULL || *s == NUL || VIM_ISDIGIT(*s))
@@ -937 +997 @@
      else
      {
-@@ -10602,7 +10642,7 @@
+@@ -10602,7 +10665,7 @@
  # ifdef FEAT_WINDOWS
             win_T       *wp;
@@ -946 +1006 @@
             if (row >= 0 && col >= 0)
             {
-@@ -10612,9 +10652,9 @@
+@@ -10612,9 +10675,9 @@
                 (void)mouse_comp_pos(win, &row, &col, &lnum);
  # ifdef FEAT_WINDOWS
@@ -958 +1018 @@
                 vimvars[VV_MOUSE_COL].vv_nr = col + 1;
             }
-@@ -11284,13 +11324,25 @@
+@@ -11284,13 +11347,25 @@
      typval_T   *argvars;
      typval_T   *rettv;
@@ -988 +1048 @@
  
  /*
-@@ -11301,14 +11353,22 @@
+@@ -11301,14 +11376,22 @@
      typval_T   *argvars;
      typval_T   *rettv;
@@ -1013 +1073 @@
  
  /*
-@@ -11782,6 +11842,10 @@
+@@ -11782,6 +11865,10 @@
             n = has_patch(atoi((char *)name + 5));
         else if (STRICMP(name, "vim_starting") == 0)
@@ -1024 +1084 @@
         else if (STRICMP(name, "balloon_multiline") == 0)
             n = multiline_balloon_available();
-@@ -15838,10 +15902,9 @@
+@@ -15838,10 +15925,9 @@
      if (res == FAIL)
         res = ITEM_COMPARE_FAIL;
@@ -1036 +1096 @@
      return res;
  }
-@@ -16590,8 +16653,11 @@
+@@ -16590,8 +16676,11 @@
                 p = highlight_has_attr(id, HL_INVERSE, modec);
                 break;
@@ -1050 +1110 @@
  
         case 'u':
-@@ -16658,7 +16724,7 @@
+@@ -16658,7 +16747,7 @@
      col = get_tv_number(&argvars[1]) - 1;      /* -1 on type error */
  
@@ -1059 +1119 @@
      {
         (void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL, TRUE);
-@@ -18097,14 +18163,28 @@
+@@ -18097,14 +18186,28 @@
  }
  
@@ -1091 +1151 @@
      vimvars[VV_COUNT1].vv_nr = count1;
  }
-@@ -18132,6 +18212,20 @@
+@@ -18132,6 +18235,20 @@
  }
  
@@ -1112 +1172 @@
   */
      void
-@@ -20590,6 +20684,9 @@
+@@ -18868,7 +18985,7 @@
+     dictitem_T *dict_var;
+ {
+     hash_init(&dict->dv_hashtab);
+-    dict->dv_refcount = 99999;
++    dict->dv_refcount = DO_NOT_FREE_CNT;
+     dict_var->di_tv.vval.v_dict = dict;
+     dict_var->di_tv.v_type = VAR_DICT;
+     dict_var->di_tv.v_lock = VAR_FIXED;
+@@ -19205,6 +19322,8 @@
+  * Copy the values from typval_T "from" to typval_T "to".
+  * When needed allocates string or increases reference count.
+  * Does not make a copy of a list or dict but copies the reference!
++ * It is OK for "from" and "to" to point to the same item.  This is used to
++ * make a copy later.
+  */
+     static void
+ copy_tv(from, to)
+@@ -20590,6 +20709,9 @@
      int                st_len = 0;
  
@@ -1122 +1200 @@
  
      for (hi = func_hashtab.ht_array; todo > 0; ++hi)
-@@ -20638,6 +20735,8 @@
+@@ -20638,6 +20760,8 @@
                                                               prof_self_cmp);
         prof_sort_list(fd, sorttab, st_len, "SELF", TRUE);
@@ -1131 +1209 @@
  
      static void
-@@ -21082,8 +21181,11 @@
-     init_var_dict(&fc.l_avars, &fc.l_avars_var);
-     add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "0",
+@@ -21012,7 +21136,7 @@
+     char_u     *save_sourcing_name;
+     linenr_T   save_sourcing_lnum;
+     scid_T     save_current_SID;
+-    funccall_T fc;
++    funccall_T *fc;
+     int                save_did_emsg;
+     static int depth = 0;
+     dictitem_T *v;
+@@ -21038,36 +21162,37 @@
+ 
+     line_breakcheck();         /* check for CTRL-C hit */
+ 
+-    fc.caller = current_funccal;
+-    current_funccal = &fc;
+-    fc.func = fp;
+-    fc.rettv = rettv;
++    fc = (funccall_T *)alloc(sizeof(funccall_T));
++    fc->caller = current_funccal;
++    current_funccal = fc;
++    fc->func = fp;
++    fc->rettv = rettv;
+     rettv->vval.v_number = 0;
+-    fc.linenr = 0;
+-    fc.returned = FALSE;
+-    fc.level = ex_nesting_level;
++    fc->linenr = 0;
++    fc->returned = FALSE;
++    fc->level = ex_nesting_level;
+     /* Check if this function has a breakpoint. */
+-    fc.breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name, (linenr_T)0);
+-    fc.dbg_tick = debug_tick;
++    fc->breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name, (linenr_T)0);
++    fc->dbg_tick = debug_tick;
+ 
+     /*
+-     * Note about using fc.fixvar[]: This is an array of FIXVAR_CNT variables
++     * Note about using fc->fixvar[]: This is an array of FIXVAR_CNT variables
+      * with names up to VAR_SHORT_LEN long.  This avoids having to alloc/free
+      * each argument variable and saves a lot of time.
+      */
+     /*
+      * Init l: variables.
+      */
+-    init_var_dict(&fc.l_vars, &fc.l_vars_var);
++    init_var_dict(&fc->l_vars, &fc->l_vars_var);
+     if (selfdict != NULL)
+     {
+        /* Set l:self to "selfdict".  Use "name" to avoid a warning from
+         * some compiler that checks the destination size. */
+-       v = &fc.fixvar[fixvar_idx++].var;
++       v = &fc->fixvar[fixvar_idx++].var;
+        name = v->di_key;
+        STRCPY(name, "self");
+        v->di_flags = DI_FLAGS_RO + DI_FLAGS_FIX;
+-       hash_add(&fc.l_vars.dv_hashtab, DI2HIKEY(v));
++       hash_add(&fc->l_vars.dv_hashtab, DI2HIKEY(v));
+        v->di_tv.v_type = VAR_DICT;
+        v->di_tv.v_lock = 0;
+        v->di_tv.vval.v_dict = selfdict;
+@@ -21079,28 +21204,31 @@
+      * Set a:0 to "argcount".
+      * Set a:000 to a list with room for the "..." arguments.
+      */
+-    init_var_dict(&fc.l_avars, &fc.l_avars_var);
+-    add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "0",
++    init_var_dict(&fc->l_avars, &fc->l_avars_var);
++    add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "0",
                                 (varnumber_T)(argcount - fp->uf_args.ga_len));
+-    v = &fc.fixvar[fixvar_idx++].var;
+-    STRCPY(v->di_key, "000");
 +    /* Use "name" to avoid a warning from some compiler that checks the
 +     * destination size. */
-     v = &fc.fixvar[fixvar_idx++].var;
--    STRCPY(v->di_key, "000");
++    v = &fc->fixvar[fixvar_idx++].var;
 +    name = v->di_key;
 +    STRCPY(name, "000");
      v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
-     hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
+-    hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
++    hash_add(&fc->l_avars.dv_hashtab, DI2HIKEY(v));
      v->di_tv.v_type = VAR_LIST;
-@@ -21204,7 +21306,7 @@
+     v->di_tv.v_lock = VAR_FIXED;
+-    v->di_tv.vval.v_list = &fc.l_varlist;
+-    vim_memset(&fc.l_varlist, 0, sizeof(list_T));
+-    fc.l_varlist.lv_refcount = 99999;
+-    fc.l_varlist.lv_lock = VAR_FIXED;
++    v->di_tv.vval.v_list = &fc->l_varlist;
++    vim_memset(&fc->l_varlist, 0, sizeof(list_T));
++    fc->l_varlist.lv_refcount = DO_NOT_FREE_CNT;
++    fc->l_varlist.lv_lock = VAR_FIXED;
+ 
+     /*
+      * Set a:firstline to "firstline" and a:lastline to "lastline".
+      * Set a:name to named arguments.
+      * Set a:N to the "..." arguments.
+      */
+-    add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "firstline",
++    add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "firstline",
+                                                      (varnumber_T)firstline);
+-    add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "lastline",
++    add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "lastline",
+                                                       (varnumber_T)lastline);
+     for (i = 0; i < argcount; ++i)
+     {
+@@ -21116,7 +21244,7 @@
+        }
+        if (fixvar_idx < FIXVAR_CNT && STRLEN(name) <= VAR_SHORT_LEN)
+        {
+-           v = &fc.fixvar[fixvar_idx++].var;
++           v = &fc->fixvar[fixvar_idx++].var;
+            v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
+        }
+        else
+@@ -21128,7 +21256,7 @@
+            v->di_flags = DI_FLAGS_RO;
+        }
+        STRCPY(v->di_key, name);
+-       hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
++       hash_add(&fc->l_avars.dv_hashtab, DI2HIKEY(v));
+ 
+        /* Note: the values are copied directly to avoid alloc/free.
+         * "argvars" must have VAR_FIXED for v_lock. */
+@@ -21137,9 +21265,9 @@
+ 
+        if (ai >= 0 && ai < MAX_FUNC_ARGS)
+        {
+-           list_append(&fc.l_varlist, &fc.l_listitems[ai]);
+-           fc.l_listitems[ai].li_tv = argvars[i];
+-           fc.l_listitems[ai].li_tv.v_lock = VAR_FIXED;
++           list_append(&fc->l_varlist, &fc->l_listitems[ai]);
++           fc->l_listitems[ai].li_tv = argvars[i];
++           fc->l_listitems[ai].li_tv.v_lock = VAR_FIXED;
+        }
+     }
+ 
+@@ -21204,7 +21332,7 @@
         if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
             func_do_profile(fp);
         if (fp->uf_profiling
 -                      || (fc.caller != NULL && &fc.caller->func->uf_profiling))
-+                      || (fc.caller != NULL && fc.caller->func->uf_profiling))
++                   || (fc->caller != NULL && fc->caller->func->uf_profiling))
         {
             ++fp->uf_tm_count;
             profile_start(&call_start);
-@@ -21235,13 +21337,13 @@
+@@ -21220,7 +21348,7 @@
+     did_emsg = FALSE;
+ 
+     /* call do_cmdline() to execute the lines */
+-    do_cmdline(NULL, get_func_line, (void *)&fc,
++    do_cmdline(NULL, get_func_line, (void *)fc,
+                                     DOCMD_NOWAIT|DOCMD_VERBOSE|DOCMD_REPEAT);
+ 
+     --RedrawingDisabled;
+@@ -21235,16 +21363,16 @@
  
  #ifdef FEAT_PROFILE
      if (do_profiling == PROF_YES && (fp->uf_profiling
 -                   || (fc.caller != NULL && &fc.caller->func->uf_profiling)))
-+                   || (fc.caller != NULL && fc.caller->func->uf_profiling)))
++                   || (fc->caller != NULL && fc->caller->func->uf_profiling)))
      {
         profile_end(&call_start);
@@ -1165 +1373 @@
         profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children);
 -       if (fc.caller != NULL && &fc.caller->func->uf_profiling)
-+       if (fc.caller != NULL && fc.caller->func->uf_profiling)
++       if (fc->caller != NULL && fc->caller->func->uf_profiling)
         {
-            profile_add(&fc.caller->func->uf_tm_children, &call_start);
-            profile_add(&fc.caller->func->uf_tml_children, &call_start);
-@@ -21886,6 +21988,62 @@
+-           profile_add(&fc.caller->func->uf_tm_children, &call_start);
+-           profile_add(&fc.caller->func->uf_tml_children, &call_start);
++           profile_add(&fc->caller->func->uf_tm_children, &call_start);
++           profile_add(&fc->caller->func->uf_tml_children, &call_start);
+        }
+     }
+ #endif
+@@ -21257,9 +21385,9 @@
+ 
+        if (aborting())
+            smsg((char_u *)_("%s aborted"), sourcing_name);
+-       else if (fc.rettv->v_type == VAR_NUMBER)
++       else if (fc->rettv->v_type == VAR_NUMBER)
+            smsg((char_u *)_("%s returning #%ld"), sourcing_name,
+-                                              (long)fc.rettv->vval.v_number);
++                                              (long)fc->rettv->vval.v_number);
+        else
+        {
+            char_u      buf[MSG_BUF_LEN];
+@@ -21270,7 +21398,7 @@
+            /* The value may be very long.  Skip the middle part, so that we
+             * have some idea how it starts and ends. smsg() would always
+             * truncate it at the end. */
+-           s = tv2string(fc.rettv, &tofree, numbuf2, 0);
++           s = tv2string(fc->rettv, &tofree, numbuf2, 0);
+            if (s != NULL)
+            {
+                trunc_string(s, buf, MSG_BUF_CLEN);
+@@ -21306,14 +21434,84 @@
+     }
+ 
+     did_emsg |= save_did_emsg;
+-    current_funccal = fc.caller;
++    current_funccal = fc->caller;
++    --depth;
+ 
+-    /* The a: variables typevals were not allocated, only free the allocated
+-     * variables. */
+-    vars_clear_ext(&fc.l_avars.dv_hashtab, FALSE);
++    /* if the a:000 list and the a: dict are not referenced we can free the
++     * funccall_T and what's in it. */
++    if (fc->l_varlist.lv_refcount == DO_NOT_FREE_CNT
++           && fc->l_vars.dv_refcount == DO_NOT_FREE_CNT
++           && fc->l_avars.dv_refcount == DO_NOT_FREE_CNT)
++    {
++       free_funccal(fc, FALSE);
++    }
++    else
++    {
++       hashitem_T      *hi;
++       listitem_T      *li;
++       int             todo;
+ 
+-    vars_clear(&fc.l_vars.dv_hashtab);         /* free all l: variables */
+-    --depth;
++       /* "fc" is still in use.  This can happen when returning "a:000" or
++        * assigning "l:" to a global variable.
++        * Link "fc" in the list for garbage collection later. */
++       fc->caller = previous_funccal;
++       previous_funccal = fc;
++
++       /* Make a copy of the a: variables, since we didn't do that above. */
++       todo = (int)fc->l_avars.dv_hashtab.ht_used;
++       for (hi = fc->l_avars.dv_hashtab.ht_array; todo > 0; ++hi)
++       {
++           if (!HASHITEM_EMPTY(hi))
++           {
++               --todo;
++               v = HI2DI(hi);
++               copy_tv(&v->di_tv, &v->di_tv);
++           }
++       }
++
++       /* Make a copy of the a:000 items, since we didn't do that above. */
++       for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next)
++           copy_tv(&li->li_tv, &li->li_tv);
++    }
++}
++
++/*
++ * Return TRUE if items in "fc" do not have "copyID".  That means they are not
++ * referenced from anywyere.
++ */
++    static int
++can_free_funccal(fc, copyID)
++    funccall_T *fc;
++    int                copyID;
++{
++    return (fc->l_varlist.lv_copyID != copyID
++           && fc->l_vars.dv_copyID != copyID
++           && fc->l_avars.dv_copyID != copyID);
++}
++
++/*
++ * Free "fc" and what it contains.
++ */
++   static void
++free_funccal(fc, free_val)
++    funccall_T *fc;
++    int                free_val;  /* a: vars were allocated */
++{
++    listitem_T *li;
++
++    /* The a: variables typevals may not have been allocated, only free the
++     * allocated variables. */
++    vars_clear_ext(&fc->l_avars.dv_hashtab, free_val);
++
++    /* free all l: variables */
++    vars_clear(&fc->l_vars.dv_hashtab);
++
++    /* Free the a:000 variables if they were allocated. */
++    if (free_val)
++       for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next)
++           clear_tv(&li->li_tv);
++
++    vim_free(fc);
+ }
+ 
+ /*
+@@ -21886,6 +22084,62 @@
      }
  }
@@ -1234 +1559 @@
 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 2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/ex_cmds.c 2008-12-30 16:17:03.000000000 -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));
@@ -1363 +1688 @@
 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 2008-12-20 15:01:04.000000000 -0800
++++ vim72/src/ex_cmds.h 2008-12-30 16:15:47.000000000 -0800
 @@ -278,7 +278,7 @@
  EX(CMD_crewind,                "crewind",      ex_cc,
@@ -1411 +1736 @@
 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        2008-12-20 15:00:13.000000000 -0800
++++ vim72/src/ex_cmds2.c        2008-12-30 16:14:45.000000000 -0800
 @@ -3145,8 +3145,8 @@
         verbose_leave();
@@ -1425 +1750 @@
 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        2008-12-20 15:02:47.000000000 -0800
++++ vim72/src/ex_docmd.c        2008-12-30 16:17:40.000000000 -0800
 @@ -364,6 +364,7 @@
  # define ex_function           ex_ni
@@ -1568 +1893 @@
 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        2008-12-20 15:02:01.000000000 -0800
++++ vim72/src/ex_getln.c        2008-12-30 16:16:50.000000000 -0800
 @@ -31,6 +31,8 @@
      int                cmdattr;        /* attributes for prompt */
@@ -1702 +2027 @@
 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 2008-12-20 15:01:04.000000000 -0800
++++ vim72/src/feature.h 2008-12-30 16:15:47.000000000 -0800
 @@ -767,9 +767,13 @@
  
@@ -1721 +2046 @@
 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  2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/fileio.c  2008-12-30 16:18:07.000000000 -0800
 @@ -932,7 +932,10 @@
      else
@@ -1806 +2131 @@
         } while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n');
      }
-@@ -8523,6 +8522,7 @@
+@@ -6120,6 +6119,47 @@
+     if (mch_stat((char *)from, &st) < 0)
+        return -1;
+ 
++#ifdef UNIX
++    {
++       struct stat     st_to;
++       char            tempname[MAXPATHL + 1];
++
++       /* It's possible for the source and destination to be the same file.
++        * This happens when "from" and "to" differ in case and are on a FAT32
++        * filesystem.  In that case go through a temp file name. */
++       if (mch_stat((char *)to, &st_to) >= 0
++               && st.st_dev == st_to.st_dev
++               && st.st_ino == st_to.st_ino)
++       {
++           /* Find a name that doesn't exist and is in the same directory.
++            * Move "from" to "tempname" and then to "to". */
++           if (STRLEN(from) >= MAXPATHL - 5)
++               return -1;
++           STRCPY(tempname, from);
++           for (n = 123; n < 99999; ++n)
++           {
++               sprintf(gettail(tempname), "%d", n);
++               if (mch_stat(tempname, &st_to) < 0)
++               {
++                   if (mch_rename((char *)from, tempname) == 0)
++                   {
++                       if (mch_rename(tempname, (char *)to) == 0)
++                           return 0;
++                       /* Strange, the second step failed.  Try moving the
++                        * file back and return failure. */
++                       mch_rename(tempname, (char *)from);
++                       return -1;
++                   }
++                   /* If it fails for one temp name it will most likely fail
++                    * for any temp name, give up. */
++                   return -1;
++               }
++           }
++           return -1;
++       }
++    }
++#endif
++
+     /*
+      * Delete the "to" file, this is required on some systems to make the
+      * mch_rename() work, on other systems it makes sure that we don't have
+@@ -8523,6 +8563,7 @@
      char_u     *save_sourcing_name;
      linenr_T   save_sourcing_lnum;
@@ -1814 +2187 @@
      char_u     *save_autocmd_match;
      int                save_autocmd_busy;
-@@ -8601,6 +8601,7 @@
+@@ -8601,6 +8642,7 @@
       * Save the autocmd_* variables and info about the current buffer.
       */
@@ -1822 +2195 @@
      save_autocmd_match = autocmd_match;
      save_autocmd_busy = autocmd_busy;
-@@ -8618,14 +8619,15 @@
+@@ -8618,14 +8660,15 @@
         if (fname != NULL && *fname != NUL)
             autocmd_fname = fname;
@@ -1840 +2213 @@
      /*
       * Set the buffer number to be used for <abuf>.
-@@ -8810,6 +8812,7 @@
+@@ -8810,6 +8853,7 @@
      sourcing_lnum = save_sourcing_lnum;
      vim_free(autocmd_fname);
@@ -1848 +2221 @@
      autocmd_match = save_autocmd_match;
  #ifdef FEAT_EVAL
-@@ -8918,7 +8921,7 @@
+@@ -8918,7 +8962,7 @@
      {
         apc->curpat = NULL;
@@ -1857 +2230 @@
          * buffer number. */
         if (ap->pat != NULL && ap->cmds != NULL
-@@ -9104,7 +9107,7 @@
+@@ -9104,7 +9148,7 @@
  set_context_in_autocmd(xp, arg, doautocmd)
      expand_T   *xp;
@@ -1868 +2241 @@
 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    2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/fold.c    2008-12-30 16:17:03.000000000 -0800
 @@ -48,7 +48,7 @@
  static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));
@@ -1902 +2275 @@
 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 2008-12-20 15:02:09.000000000 -0800
++++ vim72/src/getchar.c 2008-12-30 16:16:59.000000000 -0800
 @@ -4702,7 +4702,7 @@
                         return FAIL;
@@ -1923 +2296 @@
 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 2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/globals.h 2008-12-30 16:17:03.000000000 -0800
 @@ -1022,6 +1022,7 @@
  #endif
@@ -1949 +2322 @@
 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     2008-12-20 15:02:41.000000000 -0800
++++ vim72/src/gui.c     2008-12-30 16:17:34.000000000 -0800
 @@ -139,7 +139,7 @@
                 /* The read returns when the child closes the pipe (or when
@@ -2042 +2415 @@
 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       2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/gui_at_sb.c       2008-12-30 16:17:03.000000000 -0800
 @@ -1078,6 +1078,12 @@
      Cardinal   *num_params;    /* unused */
@@ -2068 +2441 @@
 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     2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/gui_gtk_x11.c     2008-12-30 16:17:03.000000000 -0800
 @@ -4070,14 +4070,14 @@
  
@@ -2092 +2465 @@
 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 2008-12-20 15:01:15.000000000 -0800
++++ vim72/src/gui_x11.c 2008-12-30 16:15:59.000000000 -0800
 @@ -2450,7 +2450,7 @@
         *colorPtr = colortable[closest];
@@ -2104 +2477 @@
 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       2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/gui_xmdlg.c       2008-12-30 16:17:03.000000000 -0800
 @@ -369,10 +369,10 @@
      char       buf[TEMP_BUF_SIZE];
@@ -2260 +2633 @@
 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       2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/gui_xmebw.c       2008-12-30 16:17:03.000000000 -0800
 @@ -1256,7 +1256,7 @@
      }
@@ -2287 +2660 @@
 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       2008-12-20 14:59:49.000000000 -0800
++++ vim72/src/if_cscope.c       2008-12-30 16:14:15.000000000 -0800
 @@ -74,7 +74,7 @@
      { "add",   cs_add,
@@ -2317 +2690 @@
 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       2008-12-20 14:59:49.000000000 -0800
++++ vim72/src/if_cscope.h       2008-12-30 16:14:15.000000000 -0800
 @@ -42,17 +42,6 @@
   * f 7name     Find this file
@@ -2338 +2711 @@
 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        2008-12-20 15:02:36.000000000 -0800
++++ vim72/src/if_perl.xs        2008-12-30 16:17:28.000000000 -0800
 @@ -136,6 +136,9 @@
  #  define Perl_newXS_flags dll_Perl_newXS_flags
@@ -2389 +2762 @@
 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       2008-12-20 15:01:43.000000000 -0800
++++ vim72/src/if_python.c       2008-12-30 16:16:31.000000000 -0800
 @@ -531,6 +531,12 @@
         if (PythonMod_Init())
@@ -2415 +2788 @@
 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      2008-12-20 15:01:23.000000000 -0800
++++ vim72/src/if_xcmdsrv.c      2008-12-30 16:16:09.000000000 -0800
 @@ -736,7 +736,7 @@
                 + serverReply.ga_len;
@@ -2445 +2818 @@
 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    2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/main.c    2008-12-30 16:17:03.000000000 -0800
 @@ -645,11 +645,12 @@
  
@@ -2507 +2880 @@
 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    2008-12-20 15:01:04.000000000 -0800
++++ vim72/src/mark.c    2008-12-30 16:15:47.000000000 -0800
 @@ -1627,15 +1627,17 @@
  
@@ -2576 +2949 @@
 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   2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/mbyte.c   2008-12-30 16:17:03.000000000 -0800
 @@ -717,7 +717,7 @@
                      * where mblen() returns 0 for invalid character.
@@ -2658 +3031 @@
 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    2008-12-20 14:59:42.000000000 -0800
++++ vim72/src/menu.c    2008-12-30 16:14:07.000000000 -0800
 @@ -1120,6 +1120,7 @@
         parent = menu;
@@ -2669 +3042 @@
 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 2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/message.c 2008-12-30 16:17:03.000000000 -0800
 @@ -4585,61 +4585,62 @@
                         if (remove_trailing_zeroes)
@@ -2756 +3129 @@
 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   2008-12-20 15:01:04.000000000 -0800
++++ vim72/src/misc1.c   2008-12-30 16:15:47.000000000 -0800
 @@ -3245,9 +3245,9 @@
  
@@ -2771 +3144 @@
 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   2008-12-20 15:01:15.000000000 -0800
++++ vim72/src/misc2.c   2008-12-30 16:17:58.000000000 -0800
 @@ -873,7 +873,7 @@
             /* 3. check for available memory: call mch_avail_mem() */
@@ -2807 +3180 @@
  /*
   * Like vim_strsave(), but make all characters uppercase.
+@@ -2565,7 +2561,7 @@
+     int                key;
+     int                dlen = 0;
+ 
+-    key = find_special_key(srcp, &modifiers, keycode);
++    key = find_special_key(srcp, &modifiers, keycode, FALSE);
+     if (key == 0)
+        return 0;
+ 
+@@ -2601,10 +2597,11 @@
+  * returns 0 if there is no match.
+  */
+     int
+-find_special_key(srcp, modp, keycode)
++find_special_key(srcp, modp, keycode, keep_x_key)
+     char_u     **srcp;
+     int                *modp;
+-    int                keycode; /* prefer key code, e.g. K_DEL instead of DEL */
++    int                keycode;     /* prefer key code, e.g. K_DEL instead of DEL */
++    int                keep_x_key;  /* don't translate xHome to Home key */
+ {
+     char_u     *last_dash;
+     char_u     *end_of_name;
+@@ -2672,7 +2669,8 @@
+            else
+            {
+                key = get_special_key_code(last_dash + 1);
+-               key = handle_x_keys(key);
++               if (!keep_x_key)
++                   key = handle_x_keys(key);
+            }
+ 
+            /*
 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    2008-12-20 15:01:35.000000000 -0800
++++ vim72/src/move.c    2008-12-30 16:16:21.000000000 -0800
 @@ -280,18 +280,20 @@
  
@@ -2859 +3265 @@
 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        2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/netbeans.c        2008-12-30 16:17:03.000000000 -0800
 @@ -1043,7 +1043,7 @@
         nbdebug(("EVT: %s", buf));
@@ -2897 +3303 @@
 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  2008-12-20 15:01:52.000000000 -0800
++++ vim72/src/normal.c  2008-12-30 16:16:40.000000000 -0800
 @@ -183,6 +183,8 @@
  static void    nv_cursorhold __ARGS((cmdarg_T *cap));
@@ -3085 +3491 @@
 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     2008-12-20 15:02:38.000000000 -0800
++++ vim72/src/ops.c     2008-12-30 16:17:30.000000000 -0800
 @@ -2209,12 +2209,15 @@
      {
@@ -3106 +3512 @@
 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  2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/option.c  2008-12-30 16:17:58.000000000 -0800
 @@ -2593,13 +2593,13 @@
  #ifdef FEAT_VIMINFO
@@ -3153 +3559 @@
                         /* There's another character after zeros or the string
                          * is empty.  In both cases, we are trying to set a
+@@ -8323,7 +8328,7 @@
+     {
+        --arg;                      /* put arg at the '<' */
+        modifiers = 0;
+-       key = find_special_key(&arg, &modifiers, TRUE);
++       key = find_special_key(&arg, &modifiers, TRUE, TRUE);
+        if (modifiers)              /* can't handle modifiers here */
+            key = 0;
+     }
 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 2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/os_unix.c 2008-12-30 16:17:03.000000000 -0800
 @@ -315,12 +315,15 @@
      {-1,           "Unknown!", FALSE}
@@ -3269 +3684 @@
 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    2008-12-20 15:01:52.000000000 -0800
++++ vim72/src/proto/eval.pro    2008-12-30 16:16:40.000000000 -0800
 @@ -17,7 +17,7 @@
  int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip));
@@ -3311 +3726 @@
 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 2008-12-20 15:01:04.000000000 -0800
++++ vim72/src/proto/ex_cmds.pro 2008-12-30 16:15:47.000000000 -0800
 @@ -11,7 +11,7 @@
  char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
@@ -3323 +3738 @@
 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        2008-12-20 15:02:01.000000000 -0800
++++ vim72/src/proto/ex_getln.pro        2008-12-30 16:16:50.000000000 -0800
 @@ -31,7 +31,7 @@
  void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col));
@@ -3335 +3750 @@
 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    2008-12-20 15:01:04.000000000 -0800
++++ vim72/src/proto/mark.pro    2008-12-30 16:15:47.000000000 -0800
 @@ -26,5 +26,5 @@
  void write_viminfo_filemarks __ARGS((FILE *fp));
@@ -3343 +3758 @@
 +void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof, int flags));
  /* vim: set ft=c : */
+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   2008-12-30 16:17:58.000000000 -0800
+@@ -59,7 +59,7 @@
+ int handle_x_keys __ARGS((int key));
+ char_u *get_special_key_name __ARGS((int c, int modifiers));
+ int trans_special __ARGS((char_u **srcp, char_u *dst, int keycode));
+-int find_special_key __ARGS((char_u **srcp, int *modp, int keycode));
++int find_special_key __ARGS((char_u **srcp, int *modp, int keycode, int keep_x_key));
+ int extract_modifiers __ARGS((int key, int *modp));
+ int find_special_key_in_table __ARGS((int c));
+ int get_special_key_code __ARGS((char_u *name));
 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     2008-12-20 14:59:39.000000000 -0800
++++ vim72/src/pty.c     2008-12-30 16:14:03.000000000 -0800
 @@ -270,9 +270,10 @@
  }
@@ -3361 +3788 @@
 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  2008-12-20 15:00:42.000000000 -0800
++++ vim72/src/screen.c  2008-12-30 16:15:21.000000000 -0800
 @@ -2439,9 +2439,17 @@
  
@@ -3385 +3812 @@
 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   2008-12-20 15:02:52.000000000 -0800
++++ vim72/src/spell.c   2008-12-30 16:17:46.000000000 -0800
 @@ -77,7 +77,7 @@
  
@@ -4220 +4647 @@
 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 2008-12-20 15:01:35.000000000 -0800
++++ vim72/src/structs.h 2008-12-30 16:16:21.000000000 -0800
 @@ -459,7 +459,7 @@
  typedef struct
@@ -4249 +4676 @@
 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     2008-12-20 15:02:50.000000000 -0800
++++ vim72/src/tag.c     2008-12-30 16:17:42.000000000 -0800
 @@ -2725,7 +2725,24 @@
          */
@@ -4295 +4722 @@
 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     2008-12-20 15:00:39.000000000 -0800
++++ vim72/src/testdir/Make_ming.mak     2008-12-30 16:15:18.000000000 -0800
 @@ -0,0 +1,91 @@
 +# Makefile to run tests for Vim, on Dos-like machines
@@ -4390 +4817 @@
 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  2008-12-20 15:00:21.000000000 -0800
++++ vim72/src/testdir/Makefile  2008-12-30 16:14:55.000000000 -0800
 @@ -26,15 +26,17 @@
  
@@ -4424 +4851 @@
 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 2008-12-20 15:01:10.000000000 -0800
++++ vim72/src/testdir/test42.ok 2008-12-30 16:15:53.000000000 -0800
 @@ -20,7 +20,7 @@
  ucs-2
@@ -4436 +4863 @@
 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      2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/ui.c      2008-12-30 16:17:03.000000000 -0800
 @@ -1820,7 +1820,7 @@
  #ifdef HAVE_DUP
@@ -4544 +4971 @@
 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 2008-12-20 15:02:52.000000000 -0800
-@@ -677,9 +677,152 @@
++++ vim72/src/version.c 2008-12-30 16:18:07.000000000 -0800
+@@ -677,9 +677,160 @@
  static int included_patches[] =
  {   /* Add new patch number below this line */
  /**/
++    76,
++/**/
++    75,
++/**/
++    73,
++/**/
++    70,
++/**/
 +    69,
 +/**/
@@ -4687 +5122 @@
 + * Also add a comment marker to separate the lines.
 + * See the official Vim patches for the diff format: It must use a context of
-+ * one line only.  Use "diff -C2".
++ * one line only.  Create it by hand or use "diff -C2" and edit the patch.
 + */
 +static char *(extra_patches[]) =
@@ -4698 +5133 @@
  highest_patch()
  {
-@@ -786,7 +929,7 @@
+@@ -786,7 +937,7 @@
      MSG_PUTS(_("\nRISC OS version"));
  #endif
@@ -4707 +5142 @@
      if (*compiled_arch != NUL)
      {
-@@ -825,6 +968,19 @@
+@@ -825,6 +976,19 @@
         }
      }
@@ -4729 +5164 @@
 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     2008-12-20 15:01:49.000000000 -0800
++++ vim72/src/vim.h     2008-12-30 16:16:37.000000000 -0800
 @@ -341,8 +341,14 @@
  #ifdef BACKSLASH_IN_FILENAME
@@ -4789 +5224 @@
 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  2008-12-20 15:02:13.000000000 -0800
++++ vim72/src/window.c  2008-12-30 16:17:03.000000000 -0800
 @@ -4028,14 +4028,14 @@
             if (mch_dirname(cwd, MAXPATHL) == OK)
@@ -4810 +5245 @@
 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        2008-12-20 15:02:07.000000000 -0800
++++ vim72/src/workshop.c        2008-12-30 16:16:56.000000000 -0800
 @@ -1121,8 +1121,12 @@
                                       ? (char *)curbuf->b_sfname : "<None>");