Changeset 2893698 in clfs-sysroot

Timestamp:

Mar 15, 2009, 12:15:17 PM (16 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

master

Children:

6f50e7b

Parents:

35f9c2f

Message:

Update VIM Branch Update Patch.

Files:

• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/vim-7.2-branch_update-11.patch (moved) (moved from patches/vim-7.2-branch_update-5.patch ) (219 diffs)

BOOK/introduction/common/changelog.xml

@@ -40 +40 @@
       <para>March 15, 2009</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated VIM Branch Update patch to -11.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Updated MPFR to 2.4.1 and added branch update patch.</para>

BOOK/patches.ent

@@ -89 +89 @@
 <!ENTITY tar-new_compressors-patch-size "2 KB">
 
-<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-5.patch">
-<!ENTITY vim-branch_update-patch-md5 "ad13a427a46ae23abe8740ab66fba15d">
-<!ENTITY vim-branch_update-patch-size "180 KB">
+<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-11.patch">
+<!ENTITY vim-branch_update-patch-md5 "326e75a9a9ac2d3777eba30300124652">
+<!ENTITY vim-branch_update-patch-size "253 KB">
 
 <!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">

patches/vim-7.2-branch_update-11.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 01-19-2009
+Date: 03-12-2009
 Initial Package Version: 7.2
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 7.2.084
+Description: Contains all upstream patches up to 7.2.141
              The following patches were skipped
-             007 036 041 049 071 072 074
+             007 036 041 049 071 072 074 088 089 093 101 138
 
 diff -Naur vim72.orig/Filelist vim72/Filelist
 --- vim72.orig/Filelist 2008-07-06 11:02:23.000000000 -0700
-+++ vim72/Filelist      2009-01-19 00:08:05.000000000 -0800
++++ vim72/Filelist      2009-03-12 11:54:40.397486521 -0700
 @@ -285,6 +285,7 @@
                 src/proto/os_win32.pro \
@@ -21 +21 @@
 diff -Naur vim72.orig/runtime/doc/cmdline.txt vim72/runtime/doc/cmdline.txt
 --- vim72.orig/runtime/doc/cmdline.txt  2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/cmdline.txt       2009-01-19 00:08:30.000000000 -0800
++++ vim72/runtime/doc/cmdline.txt       2009-03-12 11:54:40.529493784 -0700
 @@ -1,4 +1,4 @@
 -*cmdline.txt*   For Vim version 7.2.  Last change: 2008 Jul 29
@@ -80 +80 @@
 diff -Naur vim72.orig/runtime/doc/eval.txt vim72/runtime/doc/eval.txt
 --- vim72.orig/runtime/doc/eval.txt     2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/eval.txt  2009-01-19 00:10:10.000000000 -0800
++++ vim72/runtime/doc/eval.txt  2009-03-12 11:54:50.318122364 -0700
 @@ -1,4 +1,4 @@
 -*eval.txt*     For Vim version 7.2.  Last change: 2008 Aug 09
@@ -200 +200 @@
 diff -Naur vim72.orig/runtime/doc/netbeans.txt vim72/runtime/doc/netbeans.txt
 --- vim72.orig/runtime/doc/netbeans.txt 2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/netbeans.txt      2009-01-19 00:10:45.000000000 -0800
++++ vim72/runtime/doc/netbeans.txt      2009-03-12 11:54:59.850731108 -0700
 @@ -1,4 +1,4 @@
 -*netbeans.txt*  For Vim version 7.2.  Last change: 2008 Jun 28
@@ -222 +222 @@
 diff -Naur vim72.orig/runtime/doc/options.txt vim72/runtime/doc/options.txt
 --- vim72.orig/runtime/doc/options.txt  2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/options.txt       2009-01-19 00:09:28.000000000 -0800
++++ vim72/runtime/doc/options.txt       2009-03-12 11:55:13.407601900 -0700
 @@ -1,4 +1,4 @@
 -*options.txt*  For Vim version 7.2.  Last change: 2008 Aug 06
@@ -229 +229 @@
  
                   VIM REFERENCE MANUAL    by Bram Moolenaar
-@@ -7472,7 +7472,9 @@
+@@ -4175,9 +4175,6 @@
+        be able to execute Normal mode commands.
+        This is the opposite of the 'keymap' option, where characters are
+        mapped in Insert mode.
+-       This only works for 8-bit characters.  The value of 'langmap' may be
+-       specified with multi-byte characters (e.g., UTF-8), but only the lower
+-       8 bits of each character will be used.
+ 
+        Example (for Greek, in UTF-8):                          *greek*  >
+            :set langmap=ΑA,ΒB,ΚC,ΔD,ΕE,ΊF,ΓG,ΗH,ΙI,ΞJ,ΚK,ΛL,ΜM,ΝN,ΟO,Î P,QQ,ΡR,ΣS,΀T,ΘU,ΩV,WW,ΧX,Î¥Y,ΖZ,αa,βb,ψc,ÎŽd,εe,φf,γg,ηh,ιi,Οj,κk,λl,ÎŒm,Îœn,οo,πp,qq,ρr,σs,τt,Ξu,ωv,ςw,χx,Ï
+y,ζz
+@@ -7472,7 +7469,9 @@
                         {not available when compiled without the |+wildignore|
                         feature}
@@ -242 +253 @@
 diff -Naur vim72.orig/runtime/doc/spell.txt vim72/runtime/doc/spell.txt
 --- vim72.orig/runtime/doc/spell.txt    2008-08-09 07:23:00.000000000 -0700
-+++ vim72/runtime/doc/spell.txt 2009-01-19 00:09:54.000000000 -0800
++++ vim72/runtime/doc/spell.txt 2009-03-12 11:54:50.218113983 -0700
 @@ -1,4 +1,4 @@
 -*spell.txt*    For Vim version 7.2.  Last change: 2008 Jun 21
@@ -372 +383 @@
 diff -Naur vim72.orig/runtime/doc/starting.txt vim72/runtime/doc/starting.txt
 --- vim72.orig/runtime/doc/starting.txt 2008-08-09 07:23:00.000000000 -0700
-+++ vim72/runtime/doc/starting.txt      2009-01-19 00:08:31.000000000 -0800
++++ vim72/runtime/doc/starting.txt      2009-03-12 11:54:40.533495740 -0700
 @@ -1,4 +1,4 @@
 -*starting.txt*  For Vim version 7.2.  Last change: 2008 Jun 21
@@ -434 +445 @@
 diff -Naur vim72.orig/runtime/doc/usr_21.txt vim72/runtime/doc/usr_21.txt
 --- vim72.orig/runtime/doc/usr_21.txt   2008-08-09 07:23:01.000000000 -0700
-+++ vim72/runtime/doc/usr_21.txt        2009-01-19 00:08:31.000000000 -0800
++++ vim72/runtime/doc/usr_21.txt        2009-03-12 11:54:40.533495740 -0700
 @@ -1,4 +1,4 @@
 -*usr_21.txt*   For Vim version 7.2.  Last change: 2007 May 01
@@ -501 +512 @@
 diff -Naur vim72.orig/runtime/scripts.vim vim72/runtime/scripts.vim
 --- vim72.orig/runtime/scripts.vim      2008-08-08 15:27:21.000000000 -0700
-+++ vim72/runtime/scripts.vim   2009-01-19 00:07:18.000000000 -0800
++++ vim72/runtime/scripts.vim   2009-03-12 11:54:28.900750105 -0700
 @@ -234,6 +234,10 @@
    elseif s:line1 =~ '\<DTD\s\+XHTML\s'
@@ -515 +526 @@
 diff -Naur vim72.orig/src/auto/configure vim72/src/auto/configure
 --- vim72.orig/src/auto/configure       2008-07-24 05:40:36.000000000 -0700
-+++ vim72/src/auto/configure    2009-01-19 00:09:07.000000000 -0800
-@@ -16819,21 +16819,29 @@
++++ vim72/src/auto/configure    2009-03-12 11:55:13.667618383 -0700
+@@ -11565,6 +11565,67 @@
+ 
+ fi
+ 
++{ $as_echo "$as_me:$LINENO: checking for working volatile" >&5
++$as_echo_n "checking for working volatile... " >&6; }
++if test "${ac_cv_c_volatile+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++volatile int x;
++int * volatile y = (int *) 0;
++return !x && !y;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++        test -z "$ac_c_werror_flag" ||
++        test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  ac_cv_c_volatile=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++       ac_cv_c_volatile=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
++$as_echo "$ac_cv_c_volatile" >&6; }
++if test $ac_cv_c_volatile = no; then
++
++cat >>confdefs.h <<\_ACEOF
++#define volatile /**/
++_ACEOF
++
++fi
++
+ { $as_echo "$as_me:$LINENO: checking for mode_t" >&5
+ $as_echo_n "checking for mode_t... " >&6; }
+ if test "${ac_cv_type_mode_t+set}" = set; then
+@@ -16819,21 +16880,29 @@
    LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
  fi
@@ -556 +635 @@
 diff -Naur vim72.orig/src/buffer.c vim72/src/buffer.c
 --- vim72.orig/src/buffer.c     2008-08-06 04:00:48.000000000 -0700
-+++ vim72/src/buffer.c  2009-01-19 00:10:45.000000000 -0800
++++ vim72/src/buffer.c  2009-03-12 11:55:13.507605811 -0700
 @@ -437,10 +437,6 @@
         return;
@@ -663 +742 @@
         if (itemcnt == 0)
             s = out;
-@@ -5062,7 +5064,7 @@
+@@ -5048,7 +5050,8 @@
+         */
+        FOR_ALL_TAB_WINDOWS(tp, win)
+            if (win->w_buffer == buf)
+-               break;
++               goto win_found;
++win_found:
+        if (win != NULL && win->w_llist_ref != NULL)
+            return _("[Location List]");
+        else
+@@ -5062,7 +5065,7 @@
      {
         if (buf->b_sfname != NULL)
@@ -672 +761 @@
  #endif
      if (buf->b_fname == NULL)
+diff -Naur vim72.orig/src/config.h.in vim72/src/config.h.in
+--- vim72.orig/src/config.h.in  2008-06-21 08:01:41.000000000 -0700
++++ vim72/src/config.h.in       2009-03-12 11:55:13.667618383 -0700
+@@ -50,6 +50,9 @@
+ /* Define to empty if the keyword does not work.  */
+ #undef const
+ 
++/* Define to empty if the keyword does not work.  */
++#undef volatile
++
+ /* Define to `int' if <sys/types.h> doesn't define.  */
+ #undef mode_t
+ 
 diff -Naur vim72.orig/src/configure.in vim72/src/configure.in
 --- vim72.orig/src/configure.in 2008-07-24 05:40:26.000000000 -0700
-+++ vim72/src/configure.in      2009-01-19 00:09:07.000000000 -0800
-@@ -3152,18 +3152,25 @@
++++ vim72/src/configure.in      2009-03-12 11:55:13.667618383 -0700
+@@ -2148,6 +2148,7 @@
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_PROG_GCC_TRADITIONAL
+ AC_C_CONST
++AC_C_VOLATILE
+ AC_TYPE_MODE_T
+ AC_TYPE_OFF_T
+ AC_TYPE_PID_T
+@@ -3152,18 +3153,25 @@
  dnl But only when making dependencies, cproto and lint don't take "-isystem".
  dnl Mac gcc returns "powerpc-apple-darwin8-gcc-4.0.1 (GCC)...", need to allow
@@ -709 +819 @@
 diff -Naur vim72.orig/src/diff.c vim72/src/diff.c
 --- vim72.orig/src/diff.c       2008-03-05 03:16:56.000000000 -0800
-+++ vim72/src/diff.c    2009-01-19 00:09:50.000000000 -0800
++++ vim72/src/diff.c    2009-03-12 11:55:16.155775667 -0700
+@@ -8,7 +8,7 @@
+  */
+ 
+ /*
+- * diff.c: code for diff'ing two or three buffers.
++ * diff.c: code for diff'ing two, three or four buffers.
+  */
+ 
+ #include "vim.h"
 @@ -73,6 +73,8 @@
         {
@@ -727 +846 @@
         }
      }
+@@ -113,7 +116,7 @@
+  * Add a buffer to make diffs for.
+  * Call this when a new buffer is being edited in the current window where
+  * 'diff' is set.
+- * Marks the current buffer as being part of the diff and requireing updating.
++ * Marks the current buffer as being part of the diff and requiring updating.
+  * This must be done before any autocmd, because a command may use info
+  * about the screen contents.
+  */
 @@ -131,6 +134,7 @@
         {
@@ -784 +912 @@
         diff_a_works = MAYBE;
  #if defined(MSWIN) || defined(MSDOS)
+@@ -914,7 +929,7 @@
+        goto theend;
+ 
+ #ifdef UNIX
+-    /* Temporaraly chdir to /tmp, to avoid patching files in the current
++    /* Temporarily chdir to /tmp, to avoid patching files in the current
+      * directory when the patch file contains more than one patch.  When we
+      * have our own temp dir use that instead, it will be cleaned up when we
+      * exit (any .rej files created).  Don't change directory if we can't
 @@ -925,10 +940,10 @@
      {
@@ -797 +934 @@
      }
  #endif
+@@ -1138,7 +1153,7 @@
+ 
+     for (wp = firstwin; wp != NULL; wp = wp->w_next)
+     {
+-       if (wp == curwin || eap->forceit)
++       if (wp == curwin || (eap->forceit && wp->w_p_diff))
+        {
+            /* Set 'diff', 'scrollbind' off and 'wrap' on. */
+            wp->w_p_diff = FALSE;
+@@ -2114,6 +2129,8 @@
+            EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg);
+            return;
+        }
++       if (buf == curbuf)
++           return;             /* nothing to do */
+        idx_other = diff_buf_idx(buf);
+        if (idx_other == DB_COUNT)
+        {
 diff -Naur vim72.orig/src/edit.c vim72/src/edit.c
 --- vim72.orig/src/edit.c       2008-08-06 05:51:17.000000000 -0700
-+++ vim72/src/edit.c    2009-01-19 00:10:48.000000000 -0800
++++ vim72/src/edit.c    2009-03-12 11:55:13.411601900 -0700
 @@ -147,6 +147,7 @@
  static int  ins_compl_bs __ARGS((void));
@@ -827 +982 @@
      void
  backspace_until_column(col)
-@@ -1942,13 +1946,49 @@
+@@ -1942,13 +1946,50 @@
      {
         curwin->w_cursor.col--;
@@ -846 +1001 @@
 + * Return TRUE when something was deleted.
 + */
++/*ARGSUSED*/
 +   static int
 +del_char_after_col(limit_col)
@@ -859 +1015 @@
 +        * composing character. */
 +       mb_adjust_cursor();
-+       while (curwin->w_cursor.col < limit_col)
++       while (curwin->w_cursor.col < (colnr_T)limit_col)
 +       {
 +           int l = utf_ptr2len(ml_get_cursor());
@@ -880 +1036 @@
  /*
   * CTRL-X pressed in Insert mode.
-@@ -2418,7 +2458,7 @@
+@@ -2418,7 +2459,7 @@
         {
             had_match = (curwin->w_cursor.col > compl_col);
@@ -889 +1045 @@
  
             /* When the match isn't there (to avoid matching itself) remove it
-@@ -2470,7 +2510,7 @@
+@@ -2470,7 +2511,7 @@
             *p = NUL;
             had_match = (curwin->w_cursor.col > compl_col);
@@ -898 +1054 @@
  
             /* When the match isn't there (to avoid matching itself) remove it
-@@ -3209,7 +3249,7 @@
+@@ -3209,7 +3250,7 @@
  {
      ins_compl_del_pum();
@@ -907 +1063 @@
  
      if (compl_started)
-@@ -3264,6 +3304,20 @@
+@@ -3264,6 +3305,20 @@
  }
  
@@ -928 +1084 @@
   * matches.
   */
-@@ -3621,10 +3675,9 @@
+@@ -3621,10 +3676,9 @@
             {
                 ins_compl_delete();
@@ -941 +1097 @@
             }
  
-@@ -4256,7 +4309,7 @@
+@@ -4187,7 +4241,7 @@
+        }
+ 
+        /* check if compl_curr_match has changed, (e.g. other type of
+-        * expansion added somenthing) */
++        * expansion added something) */
+        if (type != 0 && compl_curr_match != old_match)
+            found_new_match = OK;
+ 
+@@ -4256,7 +4310,7 @@
      static void
  ins_compl_insert()
@@ -950 +1115 @@
         compl_used_match = FALSE;
      else
-@@ -4425,7 +4478,7 @@
+@@ -4425,7 +4479,7 @@
         if (!compl_get_longest || compl_used_match)
             ins_compl_insert();
@@ -959 +1124 @@
      else
         compl_used_match = FALSE;
-@@ -7123,9 +7176,12 @@
+@@ -4688,7 +4742,7 @@
+                }
+                compl_length = curwin->w_cursor.col - (int)compl_col;
+                /* IObuff is used to add a "word from the next line" would we
+-                * have enough space?  just being paranoic */
++                * have enough space?  just being paranoid */
+ #define        MIN_SPACE 75
+                if (compl_length > (IOSIZE - MIN_SPACE))
+                {
+@@ -7123,9 +7177,12 @@
   * cc == 0: character was inserted, delete it
   * cc > 0: character was replaced, put cc (first byte of original char) back
@@ -973 +1147 @@
      int                cc;
  #ifdef FEAT_VREPLACE
-@@ -7153,7 +7209,7 @@
+@@ -7153,7 +7210,7 @@
  #ifdef FEAT_MBYTE
         if (has_mbyte)
@@ -982 +1156 @@
             if (State & VREPLACE_FLAG)
                 orig_len = (int)STRLEN(ml_get_cursor());
-@@ -7203,7 +7259,7 @@
+@@ -7203,7 +7260,7 @@
         changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col);
      }
@@ -991 +1165 @@
  
  #ifdef FEAT_CINDENT
-@@ -8239,7 +8295,7 @@
+@@ -7646,9 +7703,7 @@
+      */
+     ++no_mapping;
+     regname = plain_vgetc();
+-#ifdef FEAT_LANGMAP
+     LANGMAP_ADJUST(regname, TRUE);
+-#endif
+     if (regname == Ctrl_R || regname == Ctrl_O || regname == Ctrl_P)
+     {
+        /* Get a third key for literal register insertion */
+@@ -7657,9 +7712,7 @@
+        add_to_showcmd_c(literally);
+ #endif
+        regname = plain_vgetc();
+-#ifdef FEAT_LANGMAP
+        LANGMAP_ADJUST(regname, TRUE);
+-#endif
+     }
+     --no_mapping;
+ 
+@@ -8150,7 +8203,7 @@
+ /*
+  * If the cursor is on an indent, ^T/^D insert/delete one
+  * shiftwidth. Otherwise ^T/^D behave like a "<<" or ">>".
+- * Always round the indent to 'shiftwith', this is compatible
++ * Always round the indent to 'shiftwidth', this is compatible
+  * with vi.  But vi only supports ^T and ^D after an
+  * autoindent, we support it everywhere.
+  */
+@@ -8239,7 +8292,7 @@
          * Replace mode */
         if (curwin->w_cursor.lnum != Insstart.lnum
@@ -1000 +1203 @@
      else
         (void)del_char(FALSE);
-@@ -8556,7 +8612,7 @@
+@@ -8556,7 +8609,7 @@
                 break;
             }
@@ -1011 +1214 @@
 diff -Naur vim72.orig/src/eval.c vim72/src/eval.c
 --- vim72.orig/src/eval.c       2008-08-07 12:37:22.000000000 -0700
-+++ vim72/src/eval.c    2009-01-19 00:10:21.000000000 -0800
++++ vim72/src/eval.c    2009-03-12 11:55:08.231269731 -0700
 @@ -32,6 +32,9 @@
  
@@ -1150 +1353 @@
      static int
  tv_islocked(tv)
+@@ -3902,7 +3928,7 @@
+ 
+ /*
+  * Handle top level expression:
+- *     expr1 ? expr0 : expr0
++ *     expr2 ? expr1 : expr1
+  *
+  * "arg" must point to the first non-white of the expression.
+  * "arg" is advanced to the next non-white after the recognized expression.
 @@ -6047,6 +6073,25 @@
  }
@@ -1254 +1466 @@
      {"has_key",                2, 2, f_has_key},
      {"haslocaldir",    0, 0, f_haslocaldir},
-@@ -9518,7 +9580,7 @@
+@@ -7856,9 +7918,9 @@
+     else if (!aborting())
+     {
+        if (argcount == MAX_FUNC_ARGS)
+-           emsg_funcname("E740: Too many arguments for function %s", name);
++           emsg_funcname(N_("E740: Too many arguments for function %s"), name);
+        else
+-           emsg_funcname("E116: Invalid arguments for function %s", name);
++           emsg_funcname(N_("E116: Invalid arguments for function %s"), name);
+     }
+ 
+     while (--argcount >= 0)
+@@ -8091,6 +8153,7 @@
+ 
+ /*
+  * Give an error message with a function name.  Handle <SNR> things.
++ * "ermsg" is to be passed without translation, use N_() instead of _().
+  */
+     static void
+ emsg_funcname(ermsg, name)
+@@ -9518,7 +9581,7 @@
      else
      {
@@ -1263 +1495 @@
                                     && get_tv_number_chk(&argvars[1], &error))
             flags |= WILD_KEEP_ALL;
-@@ -10300,7 +10362,8 @@
+@@ -10300,7 +10363,8 @@
      s = get_tv_string(&argvars[0]);
      if (s == NULL || *s == NUL || VIM_ISDIGIT(*s))
@@ -1273 +1505 @@
      else
      {
-@@ -10602,7 +10665,7 @@
+@@ -10602,7 +10666,7 @@
  # ifdef FEAT_WINDOWS
             win_T       *wp;
@@ -1282 +1514 @@
             if (row >= 0 && col >= 0)
             {
-@@ -10612,9 +10675,9 @@
+@@ -10612,9 +10676,9 @@
                 (void)mouse_comp_pos(win, &row, &col, &lnum);
  # ifdef FEAT_WINDOWS
@@ -1294 +1526 @@
                 vimvars[VV_MOUSE_COL].vv_nr = col + 1;
             }
-@@ -11284,13 +11347,25 @@
+@@ -11284,13 +11348,25 @@
      typval_T   *argvars;
      typval_T   *rettv;
@@ -1324 +1556 @@
  
  /*
-@@ -11301,14 +11376,22 @@
+@@ -11301,14 +11377,22 @@
      typval_T   *argvars;
      typval_T   *rettv;
@@ -1349 +1581 @@
  
  /*
-@@ -11782,6 +11865,10 @@
+@@ -11782,6 +11866,10 @@
             n = has_patch(atoi((char *)name + 5));
         else if (STRICMP(name, "vim_starting") == 0)
@@ -1360 +1592 @@
         else if (STRICMP(name, "balloon_multiline") == 0)
             n = multiline_balloon_available();
-@@ -15838,10 +15925,9 @@
+@@ -15838,10 +15926,9 @@
      if (res == FAIL)
         res = ITEM_COMPARE_FAIL;
@@ -1372 +1604 @@
      return res;
  }
-@@ -16590,8 +16676,11 @@
+@@ -16590,8 +16677,11 @@
                 p = highlight_has_attr(id, HL_INVERSE, modec);
                 break;
@@ -1386 +1618 @@
  
         case 'u':
-@@ -16658,7 +16747,7 @@
+@@ -16658,7 +16748,7 @@
      col = get_tv_number(&argvars[1]) - 1;      /* -1 on type error */
  
@@ -1395 +1627 @@
      {
         (void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL, TRUE);
-@@ -18097,14 +18186,28 @@
+@@ -18097,14 +18187,28 @@
  }
  
@@ -1427 +1659 @@
      vimvars[VV_COUNT1].vv_nr = count1;
  }
-@@ -18132,6 +18235,20 @@
+@@ -18132,6 +18236,20 @@
  }
  
@@ -1448 +1680 @@
   */
      void
-@@ -18868,7 +18985,7 @@
+@@ -18868,7 +18986,7 @@
      dictitem_T *dict_var;
  {
@@ -1457 +1689 @@
      dict_var->di_tv.v_type = VAR_DICT;
      dict_var->di_tv.v_lock = VAR_FIXED;
-@@ -19205,6 +19322,8 @@
+@@ -19205,6 +19323,8 @@
   * Copy the values from typval_T "from" to typval_T "to".
   * When needed allocates string or increases reference count.
@@ -1466 +1698 @@
      static void
  copy_tv(from, to)
-@@ -20590,6 +20709,9 @@
+@@ -19748,7 +19868,7 @@
+                }
+            }
+            else
+-               emsg_funcname("E123: Undefined function: %s", name);
++               emsg_funcname(N_("E123: Undefined function: %s"), name);
+        }
+        goto ret_free;
+     }
+@@ -19792,7 +19912,7 @@
+                                                      : eval_isnamec(arg[j])))
+                ++j;
+            if (arg[j] != NUL)
+-               emsg_funcname(_(e_invarg2), arg);
++               emsg_funcname((char *)e_invarg2, arg);
+        }
+     }
+ 
+@@ -20064,7 +20184,7 @@
+        v = find_var(name, &ht);
+        if (v != NULL && v->di_tv.v_type == VAR_FUNC)
+        {
+-           emsg_funcname("E707: Function name conflicts with variable: %s",
++           emsg_funcname(N_("E707: Function name conflicts with variable: %s"),
+                                                                        name);
+            goto erret;
+        }
+@@ -20079,7 +20199,7 @@
+            }
+            if (fp->uf_calls > 0)
+            {
+-               emsg_funcname("E127: Cannot redefine function %s: It is in use",
++               emsg_funcname(N_("E127: Cannot redefine function %s: It is in use"),
+                                                                        name);
+                goto erret;
+            }
+@@ -20590,6 +20710,9 @@
      int                st_len = 0;
  
@@ -1476 +1744 @@
  
      for (hi = func_hashtab.ht_array; todo > 0; ++hi)
-@@ -20638,6 +20760,8 @@
+@@ -20638,6 +20761,8 @@
                                                               prof_self_cmp);
         prof_sort_list(fd, sorttab, st_len, "SELF", TRUE);
@@ -1485 +1753 @@
  
      static void
-@@ -21012,7 +21136,7 @@
+@@ -21012,7 +21137,7 @@
      char_u     *save_sourcing_name;
      linenr_T   save_sourcing_lnum;
@@ -1494 +1762 @@
      static int depth = 0;
      dictitem_T *v;
-@@ -21038,36 +21162,37 @@
+@@ -21038,36 +21163,37 @@
  
      line_breakcheck();         /* check for CTRL-C hit */
@@ -1545 +1813 @@
         v->di_tv.v_lock = 0;
         v->di_tv.vval.v_dict = selfdict;
-@@ -21079,28 +21204,31 @@
+@@ -21079,28 +21205,31 @@
       * Set a:0 to "argcount".
       * Set a:000 to a list with room for the "..." arguments.
@@ -1588 +1856 @@
      for (i = 0; i < argcount; ++i)
      {
-@@ -21116,7 +21244,7 @@
+@@ -21116,7 +21245,7 @@
         }
         if (fixvar_idx < FIXVAR_CNT && STRLEN(name) <= VAR_SHORT_LEN)
@@ -1597 +1865 @@
         }
         else
-@@ -21128,7 +21256,7 @@
+@@ -21128,7 +21257,7 @@
             v->di_flags = DI_FLAGS_RO;
         }
@@ -1606 +1874 @@
         /* Note: the values are copied directly to avoid alloc/free.
          * "argvars" must have VAR_FIXED for v_lock. */
-@@ -21137,9 +21265,9 @@
+@@ -21137,9 +21266,9 @@
  
         if (ai >= 0 && ai < MAX_FUNC_ARGS)
@@ -1619 +1887 @@
      }
  
-@@ -21204,7 +21332,7 @@
+@@ -21204,7 +21333,7 @@
         if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
             func_do_profile(fp);
@@ -1628 +1896 @@
             ++fp->uf_tm_count;
             profile_start(&call_start);
-@@ -21220,7 +21348,7 @@
+@@ -21220,7 +21349,7 @@
      did_emsg = FALSE;
  
@@ -1637 +1905 @@
  
      --RedrawingDisabled;
-@@ -21235,16 +21363,16 @@
+@@ -21235,16 +21364,16 @@
  
  #ifdef FEAT_PROFILE
@@ -1658 +1926 @@
      }
  #endif
-@@ -21257,9 +21385,9 @@
+@@ -21257,9 +21386,9 @@
  
         if (aborting())
@@ -1670 +1938 @@
         {
             char_u      buf[MSG_BUF_LEN];
-@@ -21270,7 +21398,7 @@
+@@ -21270,7 +21399,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
@@ -1679 +1947 @@
             {
                 trunc_string(s, buf, MSG_BUF_CLEN);
-@@ -21306,14 +21434,84 @@
+@@ -21306,14 +21435,84 @@
      }
  
@@ -1732 +2000 @@
 +/*
 + * Return TRUE if items in "fc" do not have "copyID".  That means they are not
-+ * referenced from anywyere.
++ * referenced from anywhere.
 + */
 +    static int
@@ -1770 +2038 @@
  
  /*
-@@ -21886,6 +22084,62 @@
+@@ -21886,6 +22085,62 @@
      }
  }
@@ -1833 +2101 @@
  
  
+diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c
+--- vim72.orig/src/ex_cmds2.c   2008-07-13 09:18:22.000000000 -0700
++++ vim72/src/ex_cmds2.c        2009-03-12 11:55:13.311593519 -0700
+@@ -2842,6 +2842,7 @@
+     linenr_T               save_sourcing_lnum;
+     char_u                 *p;
+     char_u                 *fname_exp;
++    char_u                 *firstline = NULL;
+     int                            retval = FAIL;
+ #ifdef FEAT_EVAL
+     scid_T                 save_current_SID;
+@@ -2992,23 +2993,6 @@
+ 
+     cookie.level = ex_nesting_level;
+ #endif
+-#ifdef FEAT_MBYTE
+-    cookie.conv.vc_type = CONV_NONE;           /* no conversion */
+-
+-    /* Try reading the first few bytes to check for a UTF-8 BOM. */
+-    {
+-       char_u      buf[3];
+-
+-       if (fread((char *)buf, sizeof(char_u), (size_t)3, cookie.fp)
+-                                                                 == (size_t)3
+-               && buf[0] == 0xef && buf[1] == 0xbb && buf[2] == 0xbf)
+-           /* Found BOM, setup conversion and skip over it. */
+-           convert_setup(&cookie.conv, (char_u *)"utf-8", p_enc);
+-       else
+-           /* No BOM found, rewind. */
+-           fseek(cookie.fp, 0L, SEEK_SET);
+-    }
+-#endif
+ 
+     /*
+      * Keep the sourcing name/lnum, for recursive calls.
+@@ -3018,6 +3002,27 @@
+     save_sourcing_lnum = sourcing_lnum;
+     sourcing_lnum = 0;
+ 
++#ifdef FEAT_MBYTE
++    cookie.conv.vc_type = CONV_NONE;           /* no conversion */
++
++    /* Read the first line so we can check for a UTF-8 BOM. */
++    firstline = getsourceline(0, (void *)&cookie, 0);
++    if (firstline != NULL && STRLEN(firstline) >= 3 && firstline[0] == 0xef
++                             && firstline[1] == 0xbb && firstline[2] == 0xbf)
++    {
++       /* Found BOM; setup conversion, skip over BOM and recode the line. */
++       convert_setup(&cookie.conv, (char_u *)"utf-8", p_enc);
++       p = string_convert(&cookie.conv, firstline + 3, NULL);
++       if (p == NULL)
++           p = vim_strsave(firstline + 3);
++       if (p != NULL)
++       {
++           vim_free(firstline);
++           firstline = p;
++       }
++    }
++#endif
++
+ #ifdef STARTUPTIME
+     time_push(&tv_rel, &tv_start);
+ #endif
+@@ -3111,9 +3116,8 @@
+     /*
+      * Call do_cmdline, which will call getsourceline() to get the lines.
+      */
+-    do_cmdline(NULL, getsourceline, (void *)&cookie,
++    do_cmdline(firstline, getsourceline, (void *)&cookie,
+                                     DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_REPEAT);
+-
+     retval = OK;
+ 
+ #ifdef FEAT_PROFILE
+@@ -3145,8 +3149,8 @@
+        verbose_leave();
+     }
+ #ifdef STARTUPTIME
+-    vim_snprintf(IObuff, IOSIZE, "sourcing %s", fname);
+-    time_msg(IObuff, &tv_start);
++    vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname);
++    time_msg((char *)IObuff, &tv_start);
+     time_pop(&tv_rel);
+ #endif
+ 
+@@ -3171,6 +3175,7 @@
+ #endif
+     fclose(cookie.fp);
+     vim_free(cookie.nextline);
++    vim_free(firstline);
+ #ifdef FEAT_MBYTE
+     convert_setup(&cookie.conv, NULL, NULL);
+ #endif
 diff -Naur vim72.orig/src/ex_cmds.c vim72/src/ex_cmds.c
 --- vim72.orig/src/ex_cmds.c    2008-08-04 12:15:00.000000000 -0700
-+++ vim72/src/ex_cmds.c 2009-01-19 00:10:54.000000000 -0800
++++ vim72/src/ex_cmds.c 2009-03-12 11:55:13.611614471 -0700
 @@ -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));
@@ -1982 +2343 @@
      vim_free(vir.vir_line);
  #ifdef FEAT_MBYTE
-@@ -5059,6 +5062,7 @@
+@@ -2414,8 +2417,8 @@
+        cursor_on();            /* msg_start() switches it off */
+        out_flush();
+        silent_mode = save_silent;
+-       info_message = FALSE;
+     }
++    info_message = FALSE;
+ }
+ 
+ /*
+@@ -2704,7 +2707,12 @@
+        if (eap->cmdidx == CMD_saveas)
+        {
+            if (retval == OK)
++           {
+                curbuf->b_p_ro = FALSE;
++#ifdef FEAT_WINDOWS
++               redraw_tabline = TRUE;
++#endif
++           }
+            /* Change directories when the 'acd' option is set. */
+            DO_AUTOCHDIR
+        }
+@@ -5059,6 +5067,7 @@
  
             if (did_sub)
@@ -1990 +2374 @@
             sub_firstline = NULL;
         }
+@@ -6520,6 +6529,7 @@
+ static int     last_sign_typenr = MAX_TYPENR;  /* is decremented */
+ 
+ static void sign_list_defined __ARGS((sign_T *sp));
++static void sign_undefine __ARGS((sign_T *sp, sign_T *sp_prev));
+ 
+ /*
+  * ":sign" command
+@@ -6728,24 +6738,8 @@
+                /* ":sign list {name}" */
+                sign_list_defined(sp);
+            else
+-           {
+                /* ":sign undefine {name}" */
+-               vim_free(sp->sn_name);
+-               vim_free(sp->sn_icon);
+-#ifdef FEAT_SIGN_ICONS
+-               if (sp->sn_image != NULL)
+-               {
+-                   out_flush();
+-                   gui_mch_destroy_sign(sp->sn_image);
+-               }
+-#endif
+-               vim_free(sp->sn_text);
+-               if (sp_prev == NULL)
+-                   first_sign = sp->sn_next;
+-               else
+-                   sp_prev->sn_next = sp->sn_next;
+-               vim_free(sp);
+-           }
++               sign_undefine(sp, sp_prev);
+        }
+     }
+     else
+@@ -6994,6 +6988,31 @@
+ }
+ 
+ /*
++ * Undefine a sign and free its memory.
++ */
++    static void
++sign_undefine(sp, sp_prev)
++    sign_T     *sp;
++    sign_T     *sp_prev;
++{
++    vim_free(sp->sn_name);
++    vim_free(sp->sn_icon);
++#ifdef FEAT_SIGN_ICONS
++    if (sp->sn_image != NULL)
++    {
++       out_flush();
++       gui_mch_destroy_sign(sp->sn_image);
++    }
++#endif
++    vim_free(sp->sn_text);
++    if (sp_prev == NULL)
++       first_sign = sp->sn_next;
++    else
++       sp_prev->sn_next = sp->sn_next;
++    vim_free(sp);
++}
++
++/*
+  * Get highlighting attribute for sign "typenr".
+  * If "line" is TRUE: line highl, if FALSE: text highl.
+  */
+@@ -7067,6 +7086,18 @@
+     return (char_u *)_("[Deleted]");
+ }
+ 
++#if defined(EXITFREE) || defined(PROTO)
++/*
++ * Undefine/free all signs.
++ */
++    void
++free_signs()
++{
++    while (first_sign != NULL)
++       sign_undefine(first_sign, NULL);
++}
++#endif
++
+ #endif
+ 
+ #if defined(FEAT_GUI) || defined(FEAT_CLIENTSERVER) || defined(PROTO)
 diff -Naur vim72.orig/src/ex_cmds.h vim72/src/ex_cmds.h
 --- vim72.orig/src/ex_cmds.h    2008-06-21 11:47:57.000000000 -0700
-+++ vim72/src/ex_cmds.h 2009-01-19 00:08:31.000000000 -0800
++++ vim72/src/ex_cmds.h 2009-03-12 11:54:40.541495740 -0700
 @@ -278,7 +278,7 @@
  EX(CMD_crewind,                "crewind",      ex_cc,
@@ -2038 +2507 @@
                         TRLBAR|EXTRA|CMDWIN|SBOXOK),
  EX(CMD_setfiletype,    "setfiletype",  ex_setfiletype,
-diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c
---- vim72.orig/src/ex_cmds2.c   2008-07-13 09:18:22.000000000 -0700
-+++ vim72/src/ex_cmds2.c        2009-01-19 00:07:35.000000000 -0800
-@@ -3145,8 +3145,8 @@
-        verbose_leave();
-     }
- #ifdef STARTUPTIME
--    vim_snprintf(IObuff, IOSIZE, "sourcing %s", fname);
--    time_msg(IObuff, &tv_start);
-+    vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname);
-+    time_msg((char *)IObuff, &tv_start);
-     time_pop(&tv_rel);
- #endif
- 
 diff -Naur vim72.orig/src/ex_docmd.c vim72/src/ex_docmd.c
 --- vim72.orig/src/ex_docmd.c   2008-07-26 04:51:05.000000000 -0700
-+++ vim72/src/ex_docmd.c        2009-01-19 00:10:13.000000000 -0800
++++ vim72/src/ex_docmd.c        2009-03-12 11:55:24.900337757 -0700
 @@ -364,6 +364,7 @@
  # define ex_function           ex_ni
@@ -2088 +2543 @@
  #endif
         case CMD_set:
-@@ -8749,8 +8752,8 @@
+@@ -5121,7 +5124,11 @@
+            }
+ 
+            vim_free(cmd->uc_rep);
+-           cmd->uc_rep = 0;
++           cmd->uc_rep = NULL;
++#if defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL)
++           vim_free(cmd->uc_compl_arg);
++           cmd->uc_compl_arg = NULL;
++#endif
+            break;
+        }
+ 
+@@ -5479,6 +5486,9 @@
+     return OK;
+ }
+ 
++/*
++ * ":command ..."
++ */
+     static void
+ ex_command(eap)
+     exarg_T   *eap;
+@@ -5910,7 +5920,8 @@
+     char_u     *q;
+ 
+     char_u     *start;
+-    char_u     *end;
++    char_u     *end = NULL;
++    char_u     *ksp;
+     size_t     len, totlen;
+ 
+     size_t     split_len = 0;
+@@ -5927,16 +5938,51 @@
+ 
+     /*
+      * Replace <> in the command by the arguments.
++     * First round: "buf" is NULL, compute length, allocate "buf".
++     * Second round: copy result into "buf".
+      */
+     buf = NULL;
+     for (;;)
+     {
+-       p = cmd->uc_rep;
+-       q = buf;
++       p = cmd->uc_rep;    /* source */
++       q = buf;            /* destination */
+        totlen = 0;
+-       while ((start = vim_strchr(p, '<')) != NULL
+-              && (end = vim_strchr(start + 1, '>')) != NULL)
++
++       for (;;)
+        {
++           start = vim_strchr(p, '<');
++           if (start != NULL)
++               end = vim_strchr(start + 1, '>');
++           if (buf != NULL)
++           {
++               ksp = vim_strchr(p, K_SPECIAL);
++               if (ksp != NULL && (start == NULL || ksp < start || end == NULL)
++                       && ((ksp[1] == KS_SPECIAL && ksp[2] == KE_FILLER)
++# ifdef FEAT_GUI
++                           || (ksp[1] == KS_EXTRA && ksp[2] == (int)KE_CSI)
++# endif
++                           ))
++               {
++                   /* K_SPECIAL han been put in the buffer as K_SPECIAL
++                    * KS_SPECIAL KE_FILLER, like for mappings, but
++                    * do_cmdline() doesn't handle that, so convert it back.
++                    * Also change K_SPECIAL KS_EXTRA KE_CSI into CSI. */
++                   len = ksp - p;
++                   if (len > 0)
++                   {
++                       mch_memmove(q, p, len);
++                       q += len;
++                   }
++                   *q++ = ksp[1] == KS_SPECIAL ? K_SPECIAL : CSI;
++                   p = ksp + 3;
++                   continue;
++               }
++           }
++
++           /* break if there no <item> is found */
++           if (start == NULL || end == NULL)
++               break;
++
+            /* Include the '>' */
+            ++end;
+ 
+@@ -7803,6 +7849,9 @@
+ {
+     vim_free(prev_dir);
+     prev_dir = NULL;
++
++    vim_free(globaldir);
++    globaldir = NULL;
+ }
+ #endif
+ 
+@@ -7825,6 +7874,10 @@
+     else
+ #endif
+     {
++#ifdef FEAT_AUTOCMD
++       if (allbuf_locked())
++           return;
++#endif
+        if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
+                                                             && !eap->forceit)
+        {
+@@ -8749,8 +8802,8 @@
                 else if (*dirnow != NUL
                         && (ssop_flags & SSOP_CURDIR) && globaldir != NULL)
@@ -2094 +2659 @@
 -                   (void)mch_chdir((char *)globaldir);
 -                   shorten_fnames(TRUE);
-+                   if (mch_chdir((char *)globaldir) == OK)
++                   if (mch_chdir((char *)globaldir) == 0)
 +                       shorten_fnames(TRUE);
                 }
  
                 failed |= (makeopens(fd, dirnow) == FAIL);
-@@ -9506,24 +9509,50 @@
+@@ -9506,24 +9559,50 @@
                     break;
                 }
@@ -2160 +2725 @@
  
  #ifdef FEAT_SEARCHPATH
-@@ -9541,6 +9570,15 @@
+@@ -9541,6 +9620,15 @@
  #ifdef FEAT_AUTOCMD
         case SPEC_AFILE:        /* file name for autocommand */
@@ -2176 +2741 @@
                 {
                     *errormsg = (char_u *)_("E495: no autocommand file name to substitute for \"<afile>\"");
-@@ -10067,7 +10105,7 @@
+@@ -10067,7 +10155,7 @@
       */
      if (put_line(fd, "let s:sx = expand(\"<sfile>:p:r\").\"x.vim\"") == FAIL
@@ -2185 +2750 @@
         return FAIL;
  
-@@ -10689,7 +10727,8 @@
+@@ -10689,7 +10777,8 @@
         p_viminfo = (char_u *)"'100";
      if (eap->cmdidx == CMD_rviminfo)
@@ -2197 +2762 @@
 diff -Naur vim72.orig/src/ex_getln.c vim72/src/ex_getln.c
 --- vim72.orig/src/ex_getln.c   2008-08-08 02:31:33.000000000 -0700
-+++ vim72/src/ex_getln.c        2009-01-19 00:09:28.000000000 -0800
++++ vim72/src/ex_getln.c        2009-03-12 11:55:13.699620338 -0700
 @@ -31,6 +31,8 @@
      int                cmdattr;        /* attributes for prompt */
@@ -2257 +2822 @@
  #ifdef FEAT_SEARCH_EXTRA
      if (did_incsearch)
-@@ -2508,6 +2518,20 @@
+@@ -1990,8 +2000,8 @@
+ 
+ #if defined(FEAT_AUTOCMD) || defined(PROTO)
+ /*
+- * Check if "curbuf_lock" is set and return TRUE when it is and give an error
+- * message.
++ * Check if "curbuf_lock" or "allbuf_lock" is set and return TRUE when it is
++ * and give an error message.
+  */
+     int
+ curbuf_locked()
+@@ -2001,6 +2011,21 @@
+        EMSG(_("E788: Not allowed to edit another buffer now"));
+        return TRUE;
+     }
++    return allbuf_locked();
++}
++
++/*
++ * Check if "allbuf_lock" is set and return TRUE when it is and give an error
++ * message.
++ */
++    int
++allbuf_locked()
++{
++    if (allbuf_lock > 0)
++    {
++       EMSG(_("E811: Not allowed to change buffer information now"));
++       return TRUE;
++    }
+     return FALSE;
+ }
+ #endif
+@@ -2508,6 +2533,20 @@
      }
      mch_memmove(ccline.cmdbuff, p, (size_t)ccline.cmdlen + 1);
@@ -2278 +2876 @@
  }
  
-@@ -2875,6 +2899,7 @@
+@@ -2875,6 +2914,7 @@
      prev_ccline = ccline;
      ccline.cmdbuff = NULL;
@@ -2286 +2884 @@
  
  /*
-@@ -3582,6 +3607,7 @@
+@@ -3582,6 +3622,7 @@
  ExpandInit(xp)
      expand_T   *xp;
@@ -2294 +2892 @@
  #ifndef BACKSLASH_IN_FILENAME
      xp->xp_shell = FALSE;
-@@ -4871,7 +4897,7 @@
+@@ -4871,7 +4912,7 @@
      if (s == NULL)
         return FAIL;
@@ -2303 +2901 @@
      if (all == NULL)
         return FAIL;
-@@ -4912,9 +4938,10 @@
+@@ -4912,9 +4953,10 @@
   * newlines.  Returns NULL for an error or no matches.
   */
@@ -2315 +2913 @@
      expand_T   xpc;
      char_u     *buf;
-@@ -4943,10 +4970,10 @@
+@@ -4943,10 +4985,10 @@
         {
             add_pathsep(buf);
@@ -2329 +2927 @@
                     len += (int)STRLEN(p[i]) + 1;
  
+@@ -6020,9 +6062,7 @@
+ # endif
+        return K_IGNORE;
+     }
+-    cmdwin_type = ccline.cmdfirstc;
+-    if (cmdwin_type == NUL)
+-       cmdwin_type = '-';
++    cmdwin_type = get_cmdline_type();
+ 
+     /* Create the command-line buffer empty. */
+     (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE);
+@@ -6046,7 +6086,7 @@
+     /* Showing the prompt may have set need_wait_return, reset it. */
+     need_wait_return = FALSE;
+ 
+-    histtype = hist_char2type(ccline.cmdfirstc);
++    histtype = hist_char2type(cmdwin_type);
+     if (histtype == HIST_CMD || histtype == HIST_DEBUG)
+     {
+        if (p_wc == TAB)
 diff -Naur vim72.orig/src/feature.h vim72/src/feature.h
 --- vim72.orig/src/feature.h    2008-08-06 04:00:39.000000000 -0700
-+++ vim72/src/feature.h 2009-01-19 00:08:31.000000000 -0800
++++ vim72/src/feature.h 2009-03-12 11:54:40.545495740 -0700
 @@ -767,9 +767,13 @@
  
@@ -2350 +2968 @@
 diff -Naur vim72.orig/src/fileio.c vim72/src/fileio.c
 --- vim72.orig/src/fileio.c     2008-08-06 04:01:03.000000000 -0700
-+++ vim72/src/fileio.c  2009-01-19 00:10:40.000000000 -0800
-@@ -932,7 +932,10 @@
++++ vim72/src/fileio.c  2009-03-12 11:55:18.711941333 -0700
+@@ -69,7 +69,7 @@
+ static int au_find_group __ARGS((char_u *name));
+ 
+ # define AUGROUP_DEFAULT    -1     /* default autocmd group */
+-# define AUGROUP_ERROR     -2      /* errornouse autocmd group */
++# define AUGROUP_ERROR     -2      /* erroneous autocmd group */
+ # define AUGROUP_ALL       -3      /* all autocmd groups */
+ #endif
+ 
+@@ -144,7 +144,9 @@
+ # endif
+ #endif
+ static int move_lines __ARGS((buf_T *frombuf, buf_T *tobuf));
+-
++#ifdef FEAT_AUTOCMD
++static char *e_auchangedbuf = N_("E812: Autocommands changed buffer or buffer name");
++#endif
+ 
+     void
+ filemess(buf, name, s, attr)
+@@ -295,6 +297,19 @@
+     int                conv_restlen = 0;       /* nr of bytes in conv_rest[] */
+ #endif
+ 
++#ifdef FEAT_AUTOCMD
++    /* Remember the initial values of curbuf, curbuf->b_ffname and
++     * curbuf->b_fname to detect whether they are altered as a result of
++     * executing nasty autocommands.  Also check if "fname" and "sfname"
++     * point to one of these values. */
++    buf_T   *old_curbuf = curbuf;
++    char_u  *old_b_ffname = curbuf->b_ffname;
++    char_u  *old_b_fname = curbuf->b_fname;
++    int     using_b_ffname = (fname == curbuf->b_ffname)
++                                             || (sfname == curbuf->b_ffname);
++    int     using_b_fname = (fname == curbuf->b_fname)
++                                              || (sfname == curbuf->b_fname);
++#endif
+     write_no_eol_lnum = 0;     /* in case it was set by the previous read */
+ 
+     /*
+@@ -589,7 +604,21 @@
+ #ifdef FEAT_QUICKFIX
+                    if (!bt_dontwrite(curbuf))
+ #endif
++                   {
+                        check_need_swap(newfile);
++#ifdef FEAT_AUTOCMD
++                       /* SwapExists autocommand may mess things up */
++                       if (curbuf != old_curbuf
++                               || (using_b_ffname
++                                       && (old_b_ffname != curbuf->b_ffname))
++                               || (using_b_fname
++                                        && (old_b_fname != curbuf->b_fname)))
++                       {
++                           EMSG(_(e_auchangedbuf));
++                           return FAIL;
++                       }
++#endif
++                   }
+                    if (dir_of_file_exists(fname))
+                        filemess(curbuf, sfname, (char_u *)_("[New File]"), 0);
+                    else
+@@ -668,6 +697,17 @@
+ #endif
+     {
+        check_need_swap(newfile);
++#ifdef FEAT_AUTOCMD
++       if (!read_stdin && (curbuf != old_curbuf
++               || (using_b_ffname && (old_b_ffname != curbuf->b_ffname))
++               || (using_b_fname && (old_b_fname != curbuf->b_fname))))
++       {
++           EMSG(_(e_auchangedbuf));
++           if (!read_buffer)
++               close(fd);
++           return FAIL;
++       }
++#endif
+ #ifdef UNIX
+        /* Set swap file protection bits after creating it. */
+        if (swap_mode > 0 && curbuf->b_ml.ml_mfp->mf_fname != NULL)
+@@ -698,7 +738,6 @@
+     {
+        int     m = msg_scroll;
+        int     n = msg_scrolled;
+-       buf_T   *old_curbuf = curbuf;
+ 
+        /*
+         * The file must be closed again, the autocommands may want to change
+@@ -740,8 +779,13 @@
+        /*
+         * Don't allow the autocommands to change the current buffer.
+         * Try to re-open the file.
++        *
++        * Don't allow the autocommands to change the buffer name either
++        * (cd for example) if it invalidates fname or sfname.
+         */
+        if (!read_stdin && (curbuf != old_curbuf
++               || (using_b_ffname && (old_b_ffname != curbuf->b_ffname))
++               || (using_b_fname && (old_b_fname != curbuf->b_fname))
+                || (fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0)) < 0))
+        {
+            --no_wait_return;
+@@ -932,7 +976,10 @@
      else
      {
@@ -2362 +3082 @@
             fileformat = EOL_UNIX;              /* binary: use Unix format */
         else if (*p_ffs == NUL)
-@@ -2211,7 +2214,7 @@
+@@ -2211,7 +2258,7 @@
      {
         /* Use stderr for stdin, makes shell commands work. */
@@ -2371 +3091 @@
  #endif
  
-@@ -2341,11 +2344,6 @@
+@@ -2341,11 +2388,6 @@
                 STRCAT(IObuff, _("[CR missing]"));
                 c = TRUE;
@@ -2383 +3103 @@
             {
                 STRCAT(IObuff, _("[long lines split]"));
-@@ -2711,7 +2709,7 @@
+@@ -2711,7 +2753,7 @@
  {
      if (!curbuf->b_marks_read && get_viminfo_parameter('\'') > 0
@@ -2392 +3112 @@
      /* Always set b_marks_read; needed when 'viminfo' is changed to include
       * the ' parameter after opening a buffer. */
-@@ -3451,7 +3449,7 @@
+@@ -3451,7 +3493,7 @@
                 {
  # ifdef UNIX
@@ -2401 +3121 @@
                     if (mch_stat((char *)IObuff, &st) < 0
                             || st.st_uid != st_old.st_uid
-@@ -4367,7 +4365,7 @@
+@@ -4367,7 +4409,7 @@
                 || st.st_uid != st_old.st_uid
                 || st.st_gid != st_old.st_gid)
@@ -2410 +3130 @@
                 (void)mch_setperm(wfname, perm);
         }
-@@ -5550,9 +5548,10 @@
+@@ -5246,13 +5288,16 @@
+            /* Convert with iconv(). */
+            if (ip->bw_restlen > 0)
+            {
++               char *fp;
++
+                /* Need to concatenate the remainder of the previous call and
+                 * the bytes of the current call.  Use the end of the
+                 * conversion buffer for this. */
+                fromlen = len + ip->bw_restlen;
+-               from = (char *)ip->bw_conv_buf + ip->bw_conv_buflen - fromlen;
+-               mch_memmove((void *)from, ip->bw_rest, (size_t)ip->bw_restlen);
+-               mch_memmove((void *)(from + ip->bw_restlen), buf, (size_t)len);
++               fp = (char *)ip->bw_conv_buf + ip->bw_conv_buflen - fromlen;
++               mch_memmove(fp, ip->bw_rest, (size_t)ip->bw_restlen);
++               mch_memmove(fp + ip->bw_restlen, buf, (size_t)len);
++               from = fp;
+                tolen = ip->bw_conv_buflen - fromlen;
+            }
+            else
+@@ -5550,9 +5595,10 @@
             name = "ucs-4le";   /* FF FE 00 00 */
             len = 4;
@@ -2423 +3163 @@
      }
      else if (p[0] == 0xfe && p[1] == 0xff
-@@ -6031,9 +6030,9 @@
+@@ -6031,9 +6077,9 @@
         {
             tbuf[FGETS_SIZE - 2] = NUL;
@@ -2435 +3175 @@
         } while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n');
      }
-@@ -6107,12 +6106,24 @@
+@@ -6107,12 +6153,24 @@
  #ifdef HAVE_ACL
      vim_acl_T  acl;            /* ACL from original file */
@@ -2462 +3202 @@
      /*
       * Fail if the "from" file doesn't exist.  Avoids that "to" is deleted.
-@@ -6120,6 +6131,55 @@
+@@ -6120,6 +6178,55 @@
      if (mch_stat((char *)from, &st) < 0)
         return -1;
@@ -2518 +3258 @@
       * 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 +8583,7 @@
+@@ -6260,7 +6367,7 @@
+ 
+     if (!stuff_empty() || global_busy || !typebuf_typed()
+ #ifdef FEAT_AUTOCMD
+-                       || autocmd_busy || curbuf_lock > 0
++                       || autocmd_busy || curbuf_lock > 0 || allbuf_lock > 0
+ #endif
+                                        )
+        need_check_timestamps = TRUE;           /* check later */
+@@ -6462,8 +6569,10 @@
+            set_vim_var_string(VV_FCS_REASON, (char_u *)reason, -1);
+            set_vim_var_string(VV_FCS_CHOICE, (char_u *)"", -1);
+ # endif
++           ++allbuf_lock;
+            n = apply_autocmds(EVENT_FILECHANGEDSHELL,
+                                      buf->b_fname, buf->b_fname, FALSE, buf);
++           --allbuf_lock;
+            busy = FALSE;
+            if (n)
+            {
+@@ -8523,6 +8632,7 @@
      char_u     *save_sourcing_name;
      linenr_T   save_sourcing_lnum;
@@ -2526 +3286 @@
      char_u     *save_autocmd_match;
      int                save_autocmd_busy;
-@@ -8601,6 +8662,7 @@
+@@ -8601,6 +8711,7 @@
       * Save the autocmd_* variables and info about the current buffer.
       */
@@ -2534 +3294 @@
      save_autocmd_match = autocmd_match;
      save_autocmd_busy = autocmd_busy;
-@@ -8618,14 +8680,15 @@
+@@ -8618,14 +8729,15 @@
         if (fname != NULL && *fname != NUL)
             autocmd_fname = fname;
@@ -2552 +3312 @@
      /*
       * Set the buffer number to be used for <abuf>.
-@@ -8810,6 +8873,7 @@
+@@ -8810,6 +8922,7 @@
      sourcing_lnum = save_sourcing_lnum;
      vim_free(autocmd_fname);
@@ -2560 +3320 @@
      autocmd_match = save_autocmd_match;
  #ifdef FEAT_EVAL
-@@ -8918,7 +8982,7 @@
+@@ -8918,7 +9031,7 @@
      {
         apc->curpat = NULL;
@@ -2569 +3329 @@
          * buffer number. */
         if (ap->pat != NULL && ap->cmds != NULL
-@@ -9104,7 +9168,7 @@
+@@ -9104,7 +9217,7 @@
  set_context_in_autocmd(xp, arg, doautocmd)
      expand_T   *xp;
@@ -2580 +3340 @@
 diff -Naur vim72.orig/src/fold.c vim72/src/fold.c
 --- vim72.orig/src/fold.c       2008-08-06 04:01:12.000000000 -0700
-+++ vim72/src/fold.c    2009-01-19 00:10:42.000000000 -0800
++++ vim72/src/fold.c    2009-03-12 11:54:59.842732505 -0700
 @@ -48,7 +48,7 @@
  static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));
@@ -2669 +3429 @@
 diff -Naur vim72.orig/src/getchar.c vim72/src/getchar.c
 --- vim72.orig/src/getchar.c    2008-07-22 09:57:48.000000000 -0700
-+++ vim72/src/getchar.c 2009-01-19 00:09:36.000000000 -0800
-@@ -4702,7 +4702,7 @@
++++ vim72/src/getchar.c 2009-03-12 11:55:13.579612236 -0700
+@@ -3816,7 +3816,11 @@
+     int len = 1;
+ 
+     if (msg_didout || msg_silent != 0)
++    {
+        msg_putchar('\n');
++       if (got_int)        /* 'q' typed at MORE prompt */
++           return;
++    }
+     if ((mp->m_mode & (INSERT + CMDLINE)) == INSERT + CMDLINE)
+        msg_putchar('!');                       /* :map! */
+     else if (mp->m_mode & INSERT)
+@@ -4702,7 +4706,7 @@
                         return FAIL;
                     if (mp->m_noremap != REMAP_YES && fprintf(fd, "nore") < 0)
@@ -2679 +3451 @@
                     if (buf != NULL && fputs(" <buffer>", fd) < 0)
                         return FAIL;
-@@ -4801,7 +4801,7 @@
+@@ -4801,7 +4805,7 @@
             }
             if (IS_SPECIAL(c) || modifiers)     /* special key */
@@ -2690 +3462 @@
 diff -Naur vim72.orig/src/globals.h vim72/src/globals.h
 --- vim72.orig/src/globals.h    2008-07-26 04:53:29.000000000 -0700
-+++ vim72/src/globals.h 2009-01-19 00:10:45.000000000 -0800
-@@ -1022,6 +1022,7 @@
++++ vim72/src/globals.h 2009-03-12 11:55:13.699620338 -0700
+@@ -482,8 +482,10 @@
+ /*
+  * While executing external commands or in Ex mode, should not insert GUI
+  * events in the input buffer: Set hold_gui_events to non-zero.
++ *
++ * volatile because it is used in signal handler sig_sysmouse().
+  */
+-EXTERN int     hold_gui_events INIT(= 0);
++EXTERN volatile int hold_gui_events INIT(= 0);
+ 
+ /*
+  * When resizing the shell is postponed, remember the new size, and call
+@@ -597,7 +599,8 @@
+ EXTERN int     really_exiting INIT(= FALSE);
+                                /* TRUE when we are sure to exit, e.g., after
+                                 * a deadly signal */
+-EXTERN int     full_screen INIT(= FALSE);
++/* volatile because it is used in signal handler deathtrap(). */
++EXTERN volatile int full_screen INIT(= FALSE);
+                                /* TRUE when doing full-screen output
+                                 * otherwise only writing some messages */
+ 
+@@ -616,6 +619,11 @@
+ EXTERN int     curbuf_lock INIT(= 0);
+                                /* non-zero when the current buffer can't be
+                                 * changed.  Used for FileChangedRO. */
++EXTERN int     allbuf_lock INIT(= 0);
++                               /* non-zero when no buffer name can be
++                                * changed, no buffer can be deleted and
++                                * current directory can't be changed.
++                                * Used for SwapExists et al. */
+ #endif
+ #ifdef FEAT_EVAL
+ # define HAVE_SANDBOX
+@@ -739,10 +747,12 @@
+  */
+ EXTERN JMP_BUF lc_jump_env;    /* argument to SETJMP() */
+ # ifdef SIGHASARG
+-EXTERN int lc_signal;          /* catched signal number, 0 when no was signal
+-                                  catched; used for mch_libcall() */
++/* volatile because it is used in signal handlers. */
++EXTERN volatile int lc_signal; /* caught signal number, 0 when no was signal
++                                  caught; used for mch_libcall() */
+ # endif
+-EXTERN int lc_active INIT(= FALSE); /* TRUE when lc_jump_env is valid. */
++/* volatile because it is used in signal handler deathtrap(). */
++EXTERN volatile int lc_active INIT(= FALSE); /* TRUE when lc_jump_env is valid. */
+ #endif
+ 
+ #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT)
+@@ -986,7 +996,8 @@
+ EXTERN FILE    *scriptout  INIT(= NULL);   /* stream to write script to */
+ EXTERN int     read_cmd_fd INIT(= 0);      /* fd to read commands from */
+ 
+-EXTERN int     got_int INIT(= FALSE);      /* set to TRUE when interrupt
++/* volatile because it is used in signal handler catch_sigint(). */
++EXTERN volatile int got_int INIT(= FALSE);    /* set to TRUE when interrupt
+                                                signal occurred */
+ #ifdef USE_TERM_CONSOLE
+ EXTERN int     term_console INIT(= FALSE); /* set to TRUE when console used */
+@@ -1022,6 +1033,7 @@
  #endif
  #ifdef FEAT_AUTOCMD
@@ -2699 +3531 @@
  EXTERN char_u  *autocmd_match INIT(= NULL); /* name for <amatch> on cmdline */
  EXTERN int     did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */
-@@ -1339,7 +1340,6 @@
+@@ -1339,7 +1351,6 @@
  
  #ifdef FEAT_NETBEANS_INTG
@@ -2707 +3539 @@
  EXTERN int netbeansForcedQuit INIT(= 0);/* don't write modified files */
  EXTERN int netbeansReadFile INIT(= 1); /* OK to read from disk if != 0 */
-@@ -1548,6 +1548,14 @@
+@@ -1548,6 +1559,14 @@
  EXTERN time_t starttime;
  
@@ -2722 +3554 @@
   */
  #ifdef FEAT_FKMAP
+diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c
+--- vim72.orig/src/gui_at_sb.c  2004-06-07 07:32:25.000000000 -0700
++++ vim72/src/gui_at_sb.c       2009-03-12 11:54:50.138110630 -0700
+@@ -1078,6 +1078,12 @@
+     Cardinal   *num_params;    /* unused */
+ {
+     ScrollbarWidget sbw = (ScrollbarWidget)w;
++    /* Use a union to avoid a warning for the weird conversion from float to
++     * XtPointer.  Comes from Xaw/Scrollbar.c. */
++    union {
++       XtPointer xtp;
++       float xtf;
++    } xtpf;
+ 
+     if (LookAhead(w, event))
+        return;
+@@ -1085,7 +1091,8 @@
+     /* thumbProc is not pretty, but is necessary for backwards
+        compatibility on those architectures for which it work{s,ed};
+        the intent is to pass a (truncated) float by value. */
+-    XtCallCallbacks(w, XtNthumbProc, *(XtPointer*)&sbw->scrollbar.top);
++    xtpf.xtf = sbw->scrollbar.top;
++    XtCallCallbacks(w, XtNthumbProc, xtpf.xtp);
+     XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
+ }
+ 
 diff -Naur vim72.orig/src/gui.c vim72/src/gui.c
 --- vim72.orig/src/gui.c        2008-07-27 12:32:14.000000000 -0700
-+++ vim72/src/gui.c     2009-01-19 00:10:07.000000000 -0800
++++ vim72/src/gui.c     2009-03-12 11:54:50.298121805 -0700
 @@ -139,7 +139,7 @@
                 /* The read returns when the child closes the pipe (or when
@@ -2815 +3673 @@
         }
  #ifdef FEAT_WINDOWS
-diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c
---- vim72.orig/src/gui_at_sb.c  2004-06-07 07:32:25.000000000 -0700
-+++ vim72/src/gui_at_sb.c       2009-01-19 00:09:39.000000000 -0800
-@@ -1078,6 +1078,12 @@
-     Cardinal   *num_params;    /* unused */
- {
-     ScrollbarWidget sbw = (ScrollbarWidget)w;
-+    /* Use a union to avoid a warning for the weird conversion from float to
-+     * XtPointer.  Comes from Xaw/Scrollbar.c. */
-+    union {
-+       XtPointer xtp;
-+       float xtf;
-+    } xtpf;
- 
-     if (LookAhead(w, event))
-        return;
-@@ -1085,7 +1091,8 @@
-     /* thumbProc is not pretty, but is necessary for backwards
-        compatibility on those architectures for which it work{s,ed};
-        the intent is to pass a (truncated) float by value. */
--    XtCallCallbacks(w, XtNthumbProc, *(XtPointer*)&sbw->scrollbar.top);
-+    xtpf.xtf = sbw->scrollbar.top;
-+    XtCallCallbacks(w, XtNthumbProc, xtpf.xtp);
-     XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
- }
- 
 diff -Naur vim72.orig/src/gui_gtk_x11.c vim72/src/gui_gtk_x11.c
 --- vim72.orig/src/gui_gtk_x11.c        2008-07-04 03:46:24.000000000 -0700
-+++ vim72/src/gui_gtk_x11.c     2009-01-19 00:09:39.000000000 -0800
++++ vim72/src/gui_gtk_x11.c     2009-03-12 11:54:50.138110630 -0700
 @@ -4070,14 +4070,14 @@
  
@@ -2867 +3699 @@
 diff -Naur vim72.orig/src/gui_x11.c vim72/src/gui_x11.c
 --- vim72.orig/src/gui_x11.c    2008-06-08 08:13:45.000000000 -0700
-+++ vim72/src/gui_x11.c 2009-01-19 00:08:42.000000000 -0800
-@@ -2450,7 +2450,7 @@
++++ vim72/src/gui_x11.c 2009-03-12 11:55:13.599613075 -0700
+@@ -1587,6 +1587,8 @@
+     XtCloseDisplay(gui.dpy);
+     gui.dpy = NULL;
+     vimShell = (Widget)0;
++    vim_free(gui_argv);
++    gui_argv = NULL;
+ }
+ 
+ /*
+@@ -1761,6 +1763,8 @@
+      * says that this isn't needed when exiting, so just skip it. */
+     XtCloseDisplay(gui.dpy);
+ #endif
++    vim_free(gui_argv);
++    gui_argv = NULL;
+ }
+ 
+ /*
+@@ -2450,7 +2454,7 @@
         *colorPtr = colortable[closest];
      }
@@ -2877 +3727 @@
  }
  
+@@ -3439,47 +3443,37 @@
+     char_u         *signfile;
+ {
+     XpmAttributes   attrs;
+-    XImage         *sign;
++    XImage         *sign = NULL;
+     int                    status;
+ 
+     /*
+      * Setup the color substitution table.
+      */
+-    sign = NULL;
+     if (signfile[0] != NUL && signfile[0] != '-')
+     {
+-       sign = (XImage *)alloc(sizeof(XImage));
+-       if (sign != NULL)
++       XpmColorSymbol color[5] =
+        {
+-           XpmColorSymbol color[5] =
+-           {
+-               {"none", NULL, 0},
+-               {"iconColor1", NULL, 0},
+-               {"bottomShadowColor", NULL, 0},
+-               {"topShadowColor", NULL, 0},
+-               {"selectColor", NULL, 0}
+-           };
+-           attrs.valuemask = XpmColorSymbols;
+-           attrs.numsymbols = 2;
+-           attrs.colorsymbols = color;
+-           attrs.colorsymbols[0].pixel = gui.back_pixel;
+-           attrs.colorsymbols[1].pixel = gui.norm_pixel;
+-           status = XpmReadFileToImage(gui.dpy, (char *)signfile,
++           {"none", NULL, 0},
++           {"iconColor1", NULL, 0},
++           {"bottomShadowColor", NULL, 0},
++           {"topShadowColor", NULL, 0},
++           {"selectColor", NULL, 0}
++       };
++       attrs.valuemask = XpmColorSymbols;
++       attrs.numsymbols = 2;
++       attrs.colorsymbols = color;
++       attrs.colorsymbols[0].pixel = gui.back_pixel;
++       attrs.colorsymbols[1].pixel = gui.norm_pixel;
++       status = XpmReadFileToImage(gui.dpy, (char *)signfile,
+                                                         &sign, NULL, &attrs);
+-
+-           if (status == 0)
+-           {
+-               /* Sign width is fixed at two columns now.
+-               if (sign->width > gui.sign_width)
+-                   gui.sign_width = sign->width + 8; */
+-           }
+-           else
+-           {
+-               vim_free(sign);
+-               sign = NULL;
+-               EMSG(_(e_signdata));
+-           }
++       if (status == 0)
++       {
++           /* Sign width is fixed at two columns now.
++           if (sign->width > gui.sign_width)
++               gui.sign_width = sign->width + 8; */
+        }
++       else
++           EMSG(_(e_signdata));
+     }
+ 
+     return (void *)sign;
+@@ -3489,8 +3483,7 @@
+ gui_mch_destroy_sign(sign)
+     void *sign;
+ {
+-    XFree(((XImage *)sign)->data);
+-    vim_free(sign);
++    XDestroyImage((XImage*)sign);
+ }
+ #endif
+ 
 diff -Naur vim72.orig/src/gui_xmdlg.c vim72/src/gui_xmdlg.c
 --- vim72.orig/src/gui_xmdlg.c  2008-06-21 09:05:32.000000000 -0700
-+++ vim72/src/gui_xmdlg.c       2009-01-19 00:09:39.000000000 -0800
++++ vim72/src/gui_xmdlg.c       2009-03-12 11:54:50.142110910 -0700
 @@ -369,10 +369,10 @@
      char       buf[TEMP_BUF_SIZE];
@@ -3035 +3964 @@
 diff -Naur vim72.orig/src/gui_xmebw.c vim72/src/gui_xmebw.c
 --- vim72.orig/src/gui_xmebw.c  2007-09-06 03:57:51.000000000 -0700
-+++ vim72/src/gui_xmebw.c       2009-01-19 00:09:39.000000000 -0800
++++ vim72/src/gui_xmebw.c       2009-03-12 11:54:50.142110910 -0700
 @@ -1256,7 +1256,7 @@
      }
@@ -3062 +3991 @@
 diff -Naur vim72.orig/src/if_cscope.c vim72/src/if_cscope.c
 --- vim72.orig/src/if_cscope.c  2008-06-24 09:32:34.000000000 -0700
-+++ vim72/src/if_cscope.c       2009-01-19 00:07:11.000000000 -0800
++++ vim72/src/if_cscope.c       2009-03-12 11:55:05.383086185 -0700
 @@ -74,7 +74,7 @@
      { "add",   cs_add,
@@ -3072 +4001 @@
                 N_("Show this message"),      "help", 0 },
      { "kill",  cs_kill,
-@@ -1180,7 +1180,16 @@
-        (void)smsg((char_u *)_("%-5s: %-30s (Usage: %s)"),
-                                      cmdp->name, _(cmdp->help), cmdp->usage);
+@@ -1177,10 +1177,27 @@
+     (void)MSG_PUTS(_("cscope commands:\n"));
+     while (cmdp->name != NULL)
+     {
+-       (void)smsg((char_u *)_("%-5s: %-30s (Usage: %s)"),
+-                                     cmdp->name, _(cmdp->help), cmdp->usage);
++       char *help = _(cmdp->help);
++       int  space_cnt = 30 - vim_strsize((char_u *)help);
++
++       /* Use %*s rather than %30s to ensure proper alignment in utf-8 */
++       if (space_cnt < 0)
++           space_cnt = 0;
++       (void)smsg((char_u *)_("%-5s: %s%*s (Usage: %s)"),
++                                     cmdp->name,
++                                     help, space_cnt, " ",
++                                     cmdp->usage);
         if (strcmp(cmdp->name, "find") == 0)
 -           MSG_PUTS(FIND_HELP);
@@ -3092 +4034 @@
 diff -Naur vim72.orig/src/if_cscope.h vim72/src/if_cscope.h
 --- vim72.orig/src/if_cscope.h  2007-09-02 07:51:08.000000000 -0700
-+++ vim72/src/if_cscope.h       2009-01-19 00:07:11.000000000 -0800
++++ vim72/src/if_cscope.h       2009-03-12 11:54:28.876748429 -0700
 @@ -42,17 +42,6 @@
   * f 7name     Find this file
@@ -3113 +4055 @@
 diff -Naur vim72.orig/src/if_perl.xs vim72/src/if_perl.xs
 --- vim72.orig/src/if_perl.xs   2008-07-17 13:55:09.000000000 -0700
-+++ vim72/src/if_perl.xs        2009-01-19 00:10:02.000000000 -0800
++++ vim72/src/if_perl.xs        2009-03-12 11:54:50.278119291 -0700
 @@ -136,6 +136,9 @@
  #  define Perl_newXS_flags dll_Perl_newXS_flags
@@ -3164 +4106 @@
 diff -Naur vim72.orig/src/if_python.c vim72/src/if_python.c
 --- vim72.orig/src/if_python.c  2008-07-17 14:09:32.000000000 -0700
-+++ vim72/src/if_python.c       2009-01-19 00:10:59.000000000 -0800
++++ vim72/src/if_python.c       2009-03-12 11:54:59.902735857 -0700
 @@ -531,6 +531,12 @@
         if (PythonMod_Init())
@@ -3266 +4208 @@
 diff -Naur vim72.orig/src/if_xcmdsrv.c vim72/src/if_xcmdsrv.c
 --- vim72.orig/src/if_xcmdsrv.c 2008-07-18 06:05:03.000000000 -0700
-+++ vim72/src/if_xcmdsrv.c      2009-01-19 00:08:50.000000000 -0800
++++ vim72/src/if_xcmdsrv.c      2009-03-12 11:54:43.269670345 -0700
 @@ -736,7 +736,7 @@
                 + serverReply.ga_len;
@@ -3294 +4236 @@
                 p = entry;
                 continue;
+diff -Naur vim72.orig/src/macros.h vim72/src/macros.h
+--- vim72.orig/src/macros.h     2007-08-04 04:44:18.000000000 -0700
++++ vim72/src/macros.h  2009-03-12 11:55:13.411601900 -0700
+@@ -127,15 +127,31 @@
+ #ifdef FEAT_LANGMAP
+ /*
+  * Adjust chars in a language according to 'langmap' option.
+- * NOTE that there is NO overhead if 'langmap' is not set; but even
+- * when set we only have to do 2 ifs and an array lookup.
++ * NOTE that there is no noticeable overhead if 'langmap' is not set.
++ * When set the overhead for characters < 256 is small.
+  * Don't apply 'langmap' if the character comes from the Stuff buffer.
+  * The do-while is just to ignore a ';' after the macro.
+  */
+-# define LANGMAP_ADJUST(c, condition) do { \
+-       if (*p_langmap && (condition) && !KeyStuffed && (c) >= 0 && (c) < 256) \
+-           c = langmap_mapchar[c]; \
++# ifdef FEAT_MBYTE
++#  define LANGMAP_ADJUST(c, condition) \
++    do { \
++        if (*p_langmap && (condition) && !KeyStuffed && (c) >= 0) \
++       { \
++           if ((c) < 256) \
++               c = langmap_mapchar[c]; \
++           else \
++               c = langmap_adjust_mb(c); \
++       } \
+     } while (0)
++# else
++#  define LANGMAP_ADJUST(c, condition) \
++    do { \
++        if (*p_langmap && (condition) && !KeyStuffed && (c) >= 0 && (c) < 256) \
++            c = langmap_mapchar[c]; \
++    } while (0)
++# endif
++#else
++# define LANGMAP_ADJUST(c, condition) /* nop */
+ #endif
+ 
+ /*
 diff -Naur vim72.orig/src/main.c vim72/src/main.c
 --- vim72.orig/src/main.c       2008-07-24 01:40:56.000000000 -0700
-+++ vim72/src/main.c    2009-01-19 00:09:39.000000000 -0800
++++ vim72/src/main.c    2009-03-12 11:54:50.142110910 -0700
 @@ -645,11 +645,12 @@
  
@@ -3358 +4340 @@
 diff -Naur vim72.orig/src/mark.c vim72/src/mark.c
 --- vim72.orig/src/mark.c       2008-08-08 15:06:49.000000000 -0700
-+++ vim72/src/mark.c    2009-01-19 00:08:31.000000000 -0800
++++ vim72/src/mark.c    2009-03-12 11:54:40.549496299 -0700
 @@ -1627,15 +1627,17 @@
  
@@ -3427 +4409 @@
 diff -Naur vim72.orig/src/mbyte.c vim72/src/mbyte.c
 --- vim72.orig/src/mbyte.c      2008-07-14 05:38:05.000000000 -0700
-+++ vim72/src/mbyte.c   2009-01-19 00:09:39.000000000 -0800
++++ vim72/src/mbyte.c   2009-03-12 11:54:50.142110910 -0700
 @@ -717,7 +717,7 @@
                      * where mblen() returns 0 for invalid character.
@@ -3509 +4491 @@
 diff -Naur vim72.orig/src/menu.c vim72/src/menu.c
 --- vim72.orig/src/menu.c       2008-06-21 12:53:43.000000000 -0700
-+++ vim72/src/menu.c    2009-01-19 00:07:05.000000000 -0800
++++ vim72/src/menu.c    2009-03-12 11:54:28.852745635 -0700
 @@ -1120,6 +1120,7 @@
         parent = menu;
@@ -3520 +4502 @@
 diff -Naur vim72.orig/src/message.c vim72/src/message.c
 --- vim72.orig/src/message.c    2008-07-09 11:24:55.000000000 -0700
-+++ vim72/src/message.c 2009-01-19 00:10:51.000000000 -0800
-@@ -4556,7 +4556,13 @@
++++ vim72/src/message.c 2009-03-12 11:55:13.623615309 -0700
+@@ -976,7 +976,7 @@
+                    }
+                }
+                else if (msg_scrolled > Rows - 2
+-                                    && (c == 'j' || c == K_DOWN || c == 'd'))
++                        && (c == 'j' || c == K_DOWN || c == 'd' || c == 'f'))
+                    c = K_IGNORE;
+            }
+        } while ((had_got_int && c == Ctrl_C)
+@@ -2504,7 +2504,6 @@
+            break;
+ 
+        case 'u':               /* Up half a page */
+-       case K_PAGEUP:
+            scroll = -(Rows / 2);
+            break;
+ 
+@@ -2513,10 +2512,12 @@
+            break;
+ 
+        case 'b':               /* one page back */
++       case K_PAGEUP:
+            scroll = -(Rows - 1);
+            break;
+ 
+        case ' ':               /* one extra page */
++       case 'f':
+        case K_PAGEDOWN:
+        case K_LEFTMOUSE:
+            scroll = Rows - 1;
+@@ -2552,7 +2553,6 @@
+            {
+                /* Jump to the choices of the dialog. */
+                retval = TRUE;
+-               lines_left = Rows - 1;
+            }
+            else
+ #endif
+@@ -2560,6 +2560,9 @@
+                got_int = TRUE;
+                quit_more = TRUE;
+            }
++           /* When there is some more output (wrapping line) display that
++            * without another prompt. */
++           lines_left = Rows - 1;
+            break;
+ 
+ #ifdef FEAT_CLIPBOARD
+@@ -3309,7 +3312,10 @@
+     {
+        c = gui_mch_dialog(type, title, message, buttons, dfltbutton,
+                                                                   textfield);
+-       msg_end_prompt();
++       /* avoid a hit-enter prompt without clearing the cmdline */
++       need_wait_return = FALSE;
++       emsg_on_display = FALSE;
++       cmdline_row = msg_row;
+ 
+        /* Flush output to avoid that further messages and redrawing is done
+         * in the wrong order. */
+@@ -4556,7 +4562,13 @@
                         remove_trailing_zeroes = TRUE;
                     }
@@ -3536 +4578 @@
                         /* Avoid a buffer overflow */
                         strcpy(tmp, "inf");
-@@ -4585,61 +4591,62 @@
+@@ -4585,61 +4597,62 @@
                         if (remove_trailing_zeroes)
                         {
@@ -3622 +4664 @@
 diff -Naur vim72.orig/src/misc1.c vim72/src/misc1.c
 --- vim72.orig/src/misc1.c      2008-07-12 12:20:53.000000000 -0700
-+++ vim72/src/misc1.c   2009-01-19 00:08:31.000000000 -0800
++++ vim72/src/misc1.c   2009-03-12 11:54:40.553496578 -0700
 @@ -3245,9 +3245,9 @@
  
@@ -3637 +4679 @@
 diff -Naur vim72.orig/src/misc2.c vim72/src/misc2.c
 --- vim72.orig/src/misc2.c      2008-07-23 12:12:56.000000000 -0700
-+++ vim72/src/misc2.c   2009-01-19 00:10:29.000000000 -0800
-@@ -873,7 +873,7 @@
++++ vim72/src/misc2.c   2009-03-12 11:55:33.688900964 -0700
+@@ -496,7 +496,8 @@
+ {
+     colnr_T len;
+ #ifdef FEAT_VIRTUALEDIT
+-    colnr_T oldcol = curwin->w_cursor.col + curwin->w_cursor.coladd;
++    colnr_T oldcol = curwin->w_cursor.col;
++    colnr_T oldcoladd = curwin->w_cursor.col + curwin->w_cursor.coladd;
+ #endif
+ 
+     len = (colnr_T)STRLEN(ml_get_curline());
+@@ -535,7 +536,13 @@
+     if (oldcol == MAXCOL)
+        curwin->w_cursor.coladd = 0;
+     else if (ve_flags == VE_ALL)
+-       curwin->w_cursor.coladd = oldcol - curwin->w_cursor.col;
++    {
++       if (oldcoladd > curwin->w_cursor.col)
++           curwin->w_cursor.coladd = oldcoladd - curwin->w_cursor.col;
++       else
++           /* avoid weird number when there is a miscalculation or overflow */
++           curwin->w_cursor.coladd = 0;
++    }
+ #endif
+ }
+ 
+@@ -873,7 +880,7 @@
             /* 3. check for available memory: call mch_avail_mem() */
             if (mch_avail_mem(TRUE) < KEEP_ROOM && !releasing)
@@ -3647 +4714 @@
             }
             else
-@@ -1257,7 +1257,6 @@
+@@ -1010,6 +1017,9 @@
+ # if defined(FEAT_PROFILE)
+     do_cmdline_cmd((char_u *)"profdel *");
+ # endif
++# if defined(FEAT_KEYMAP)
++    do_cmdline_cmd((char_u *)"set keymap=");
++#endif
+ 
+ # ifdef FEAT_TITLE
+     free_titles();
+@@ -1034,6 +1044,9 @@
+     free_regexp_stuff();
+     free_tag_stuff();
+     free_cd_dir();
++# ifdef FEAT_SIGNS
++    free_signs();
++# endif
+ # ifdef FEAT_EVAL
+     set_expr_line(NULL);
+ # endif
+@@ -1257,7 +1270,6 @@
      return escaped_string;
  }
@@ -3655 +4742 @@
   * Return TRUE when 'shell' has "csh" in the tail.
   */
-@@ -1266,9 +1265,7 @@
+@@ -1266,9 +1278,7 @@
  {
      return (strstr((char *)gettail(p_sh), "csh") != NULL);
@@ -3665 +4752 @@
   * Escape "string" for use as a shell argument with system().
   * This uses single quotes, except when we know we need to use double qoutes
-@@ -1391,7 +1388,6 @@
+@@ -1391,7 +1401,6 @@
  
      return escaped_string;
@@ -3673 +4760 @@
  /*
   * Like vim_strsave(), but make all characters uppercase.
-@@ -2565,7 +2561,7 @@
+@@ -2565,7 +2574,7 @@
      int                key;
      int                dlen = 0;
@@ -3682 +4769 @@
         return 0;
  
-@@ -2601,10 +2597,11 @@
+@@ -2601,10 +2610,11 @@
   * returns 0 if there is no match.
   */
@@ -3696 +4783 @@
      char_u     *last_dash;
      char_u     *end_of_name;
-@@ -2672,7 +2669,8 @@
+@@ -2672,7 +2682,8 @@
             else
             {
@@ -3706 +4793 @@
  
             /*
+@@ -4698,7 +4709,8 @@
+                                stackp->ffs_filearray_cur = i + 1;
+                                ff_push(search_ctx, stackp);
+ 
+-                               simplify_filename(file_path);
++                               if (!path_with_url(file_path))
++                                   simplify_filename(file_path);
+                                if (mch_dirname(ff_expand_buffer, MAXPATHL)
+                                                                        == OK)
+                                {
 diff -Naur vim72.orig/src/move.c vim72/src/move.c
 --- vim72.orig/src/move.c       2008-07-12 09:26:47.000000000 -0700
-+++ vim72/src/move.c    2009-01-19 00:09:02.000000000 -0800
++++ vim72/src/move.c    2009-03-12 11:54:46.913903059 -0700
 @@ -280,18 +280,20 @@
  
@@ -3756 +4853 @@
      wp->w_topfill = 0;
  #endif
+diff -Naur vim72.orig/src/nbdebug.c vim72/src/nbdebug.c
+--- vim72.orig/src/nbdebug.c    2008-06-22 08:38:58.000000000 -0700
++++ vim72/src/nbdebug.c 2009-03-12 11:55:13.487606370 -0700
+@@ -33,7 +33,6 @@
+ u_int           nb_dlevel = 0;         /* nb_debug verbosity level */
+ 
+ void            nbdb(char *, ...);
+-void            nbtrace(char *, ...);
+ 
+ static int      lookup(char *);
+ #ifdef USE_NB_ERRORHANDLER
+@@ -100,25 +99,6 @@
+ }    /* end nbdebug_log_init */
+ 
+ 
+-
+-
+-void
+-nbtrace(
+-       char            *fmt,
+-       ...)
+-{
+-       va_list          ap;
+-
+-       if (nb_debug!= NULL && (nb_dlevel & (NB_TRACE | NB_TRACE_VERBOSE))) {
+-               va_start(ap, fmt);
+-               vfprintf(nb_debug, fmt, ap);
+-               va_end(ap);
+-               fflush(nb_debug);
+-       }
+-
+-}    /* end nbtrace */
+-
+-
+ void
+ nbdbg(
+        char            *fmt,
+@@ -136,23 +116,6 @@
+ }    /* end nbdbg */
+ 
+ 
+-void
+-nbprt(
+-       char            *fmt,
+-       ...)
+-{
+-       va_list          ap;
+-
+-       if (nb_debug != NULL && nb_dlevel & NB_PRINT) {
+-               va_start(ap, fmt);
+-               vfprintf(nb_debug, fmt, ap);
+-               va_end(ap);
+-               fflush(nb_debug);
+-       }
+-
+-}    /* end nbprt */
+-
+-
+ static int
+ lookup(
+        char            *file)
+diff -Naur vim72.orig/src/nbdebug.h vim72/src/nbdebug.h
+--- vim72.orig/src/nbdebug.h    2008-06-22 07:31:50.000000000 -0700
++++ vim72/src/nbdebug.h 2009-03-12 11:55:13.487606370 -0700
+@@ -43,8 +43,6 @@
+ 
+ 
+ void            nbdbg(char *, ...);
+-void            nbprt(char *, ...);
+-void            nbtrace(char *, ...);
+ 
+ void nbdebug_wait __ARGS((u_int wait_flags, char *wait_var, u_int wait_secs));
+ void nbdebug_log_init __ARGS((char *log_var, char *level_var));
+@@ -70,19 +68,5 @@
+ {
+ }
+ 
+-void
+-nbprt(
+-       char            *fmt,
+-       ...)
+-{
+-}
+-
+-void
+-nbtrace(
+-       char            *fmt,
+-       ...)
+-{
+-}
+-
+ #endif /* NBDEBUG */
+ #endif /* NBDEBUG_H */
 diff -Naur vim72.orig/src/netbeans.c vim72/src/netbeans.c
 --- vim72.orig/src/netbeans.c   2008-07-13 09:19:54.000000000 -0700
-+++ vim72/src/netbeans.c        2009-01-19 00:10:45.000000000 -0800
++++ vim72/src/netbeans.c        2009-03-12 11:55:13.479606090 -0700
 @@ -1043,7 +1043,7 @@
         nbdebug(("EVT: %s", buf));
@@ -3768 +4958 @@
  }
  
+@@ -1921,7 +1921,7 @@
+            vim_free(path);
+            if (bufp == NULL)
+            {
+-               nbdebug(("    File %s not found in setBufferNumber\n", args));
++               nbdebug(("    File %s not found in setBufferNumber\n", args));
+                EMSG2("E642: File %s not found in setBufferNumber", args);
+                return FAIL;
+            }
 @@ -2277,9 +2277,6 @@
             int serNum;
@@ -3794 +4993 @@
                 nbdebug(("    partial line annotation -- Not Yet Implemented!\n"));
             }
+@@ -2321,7 +2315,7 @@
+            }
+            if (pos)
+            {
+-               coloncmd(":sign place %d line=%d name=%d buffer=%d",
++               coloncmd(":sign place %d line=%ld name=%d buffer=%d",
+                           serNum, pos->lnum, typeNum, buf->bufp->b_fnum);
+                if (typeNum == curPCtype)
+                    coloncmd(":sign jump %d buffer=%d", serNum,
+@@ -2425,7 +2419,7 @@
+                                GUARDED) == 0)
+                            {
+                                coloncmd(
+-                                   ":sign place %d line=%d name=%d buffer=%d",
++                                   ":sign place %d line=%ld name=%d buffer=%d",
+                                     guardId++, lnum, GUARDED,
+                                     buf->bufp->b_fnum);
+                            }
 @@ -2924,44 +2918,26 @@
  }
@@ -3847 +5064 @@
 diff -Naur vim72.orig/src/normal.c vim72/src/normal.c
 --- vim72.orig/src/normal.c     2008-07-31 13:03:08.000000000 -0700
-+++ vim72/src/normal.c  2009-01-19 00:09:18.000000000 -0800
++++ vim72/src/normal.c  2009-03-12 11:55:13.415602459 -0700
 @@ -183,6 +183,8 @@
  static void    nv_cursorhold __ARGS((cmdarg_T *cap));
@@ -3880 +5097 @@
  #ifdef FEAT_AUTOCMD
      /* Restore counts from before receiving K_CURSORHOLD.  This means after
-@@ -717,7 +727,15 @@
+@@ -641,10 +651,7 @@
+      * Get the command character from the user.
+      */
+     c = safe_vgetc();
+-
+-#ifdef FEAT_LANGMAP
+     LANGMAP_ADJUST(c, TRUE);
+-#endif
+ 
+ #ifdef FEAT_VISUAL
+     /*
+@@ -717,7 +724,15 @@
              * command, so that v:count can be used in an expression mapping
              * right after the count. */
@@ -3897 +5125 @@
             if (ctrl_w)
             {
-@@ -804,7 +822,7 @@
+@@ -726,9 +741,7 @@
+            }
+            ++no_zero_mapping;          /* don't map zero here */
+            c = plain_vgetc();
+-#ifdef FEAT_LANGMAP
+            LANGMAP_ADJUST(c, TRUE);
+-#endif
+            --no_zero_mapping;
+            if (ctrl_w)
+            {
+@@ -751,9 +764,7 @@
+            ++no_mapping;
+            ++allow_keys;               /* no mapping for nchar, but keys */
+            c = plain_vgetc();          /* get next character */
+-#ifdef FEAT_LANGMAP
+            LANGMAP_ADJUST(c, TRUE);
+-#endif
+            --no_mapping;
+            --allow_keys;
+ #ifdef FEAT_CMDL_INFO
+@@ -804,7 +815,7 @@
       * Only set v:count when called from main() and not a stuffed command.
       */
@@ -3906 +5154 @@
  
      /*
-@@ -1132,7 +1150,8 @@
+@@ -941,9 +952,7 @@
+             * "gr", "g'" and "g`".
+             */
+            ca.nchar = plain_vgetc();
+-#ifdef FEAT_LANGMAP
+            LANGMAP_ADJUST(ca.nchar, TRUE);
+-#endif
+ #ifdef FEAT_CMDL_INFO
+            need_flushbuf |= add_to_showcmd(ca.nchar);
+ #endif
+@@ -1044,10 +1053,8 @@
+                }
+ #endif
+ 
+-#ifdef FEAT_LANGMAP
+                /* adjust chars > 127, except after "tTfFr" commands */
+                LANGMAP_ADJUST(*cp, !lang);
+-#endif
+ #ifdef FEAT_RIGHTLEFT
+                /* adjust Hebrew mapped char */
+                if (p_hkmap && lang && KeyTyped)
+@@ -1132,7 +1139,8 @@
         out_flush();
  #endif
@@ -3916 +5185 @@
  
      State = NORMAL;
-@@ -3509,7 +3528,7 @@
+@@ -3509,7 +3517,7 @@
         if (find_type & FIND_STRING)
             EMSG(_("E348: No string under cursor"));
@@ -3925 +5194 @@
      }
      ptr += col;
-@@ -5469,6 +5488,20 @@
+@@ -4611,9 +4619,7 @@
+            ++no_mapping;
+            ++allow_keys;   /* no mapping for nchar, but allow key codes */
+            nchar = plain_vgetc();
+-#ifdef FEAT_LANGMAP
+            LANGMAP_ADJUST(nchar, TRUE);
+-#endif
+            --no_mapping;
+            --allow_keys;
+ #ifdef FEAT_CMDL_INFO
+@@ -4969,9 +4975,7 @@
+                ++no_mapping;
+                ++allow_keys;   /* no mapping for nchar, but allow key codes */
+                nchar = plain_vgetc();
+-#ifdef FEAT_LANGMAP
+                LANGMAP_ADJUST(nchar, TRUE);
+-#endif
+                --no_mapping;
+                --allow_keys;
+ #ifdef FEAT_CMDL_INFO
+@@ -5469,6 +5473,20 @@
                 STRCPY(buf, "he! ");
             else
@@ -3946 +5235 @@
                  * really what we want? */
                 isman = (STRCMP(kp, "man") == 0);
-@@ -5511,37 +5544,59 @@
+@@ -5511,37 +5529,59 @@
      /*
       * Now grab the chars in the identifier
@@ -3985 +5274 @@
 +           vim_free(buf);
 +           return;
-        }
++       }
 +       buf = (char_u *)vim_realloc(buf, STRLEN(buf) + STRLEN(p) + 1);
 +       if (buf == NULL)
@@ -3992 +5281 @@
 +           vim_free(p);
 +           return;
-+       }
+        }
 +       STRCAT(buf, p);
 +       vim_free(p);
@@ -4033 +5322 @@
      /*
       * Execute the command.
+@@ -6728,6 +6768,8 @@
+     /* Visual mode "r" */
+     if (VIsual_active)
+     {
++       if (got_int)
++           reset_VIsual();
+        nv_operator(cap);
+        return;
+     }
+@@ -7784,7 +7826,7 @@
+        else
+            i = curwin->w_leftcol;
+        /* Go to the middle of the screen line.  When 'number' is on and lines
+-        * are wrapping the middle can be more to the left.*/
++        * are wrapping the middle can be more to the left. */
+        if (cap->nchar == 'm')
+            i += (W_WIDTH(curwin) - curwin_col_off()
+                    + ((curwin->w_p_wrap && i > 0)
 diff -Naur vim72.orig/src/ops.c vim72/src/ops.c
 --- vim72.orig/src/ops.c        2008-06-21 13:08:59.000000000 -0700
-+++ vim72/src/ops.c     2009-01-19 00:10:04.000000000 -0800
-@@ -2209,12 +2209,15 @@
++++ vim72/src/ops.c     2009-03-12 11:55:27.544506216 -0700
+@@ -72,11 +72,11 @@
+  */
+ struct block_def
+ {
+-    int                startspaces;    /* 'extra' cols of first char */
+-    int                endspaces;      /* 'extra' cols of first char */
++    int                startspaces;    /* 'extra' cols before first char */
++    int                endspaces;      /* 'extra' cols after last char */
+     int                textlen;        /* chars in block */
+-    char_u     *textstart;     /* pointer to 1st char in block */
+-    colnr_T    textcol;        /* cols of chars (at least part.) in block */
++    char_u     *textstart;     /* pointer to 1st char (partially) in block */
++    colnr_T    textcol;        /* index of chars (partially) in block */
+     colnr_T    start_vcol;     /* start col of 1st char wholly inside block */
+     colnr_T    end_vcol;       /* start col of 1st char wholly after block */
+ #ifdef FEAT_VISUALEXTRA
+@@ -382,15 +382,14 @@
+ {
+     int                        left = (oap->op_type == OP_LSHIFT);
+     int                        oldstate = State;
+-    int                        total, split;
+-    char_u             *newp, *oldp, *midp, *ptr;
++    int                        total;
++    char_u             *newp, *oldp;
+     int                        oldcol = curwin->w_cursor.col;
+     int                        p_sw = (int)curbuf->b_p_sw;
+     int                        p_ts = (int)curbuf->b_p_ts;
+     struct block_def   bd;
+-    int                        internal = 0;
+     int                        incr;
+-    colnr_T            vcol, col = 0, ws_vcol;
++    colnr_T            ws_vcol;
+     int                        i = 0, j = 0;
+     int                        len;
+ 
+@@ -456,67 +455,89 @@
+     }
+     else /* left */
+     {
+-       vcol = oap->start_vcol;
+-       /* walk vcol past ws to be removed */
+-       for (midp = oldp + bd.textcol;
+-             vcol < (oap->start_vcol + total) && vim_iswhite(*midp); )
+-       {
+-           incr = lbr_chartabsize_adv(&midp, (colnr_T)vcol);
+-           vcol += incr;
+-       }
+-       /* internal is the block-internal ws replacing a split TAB */
+-       if (vcol > (oap->start_vcol + total))
+-       {
+-           /* we have to split the TAB *(midp-1) */
+-           internal = vcol - (oap->start_vcol + total);
+-       }
+-       /* if 'expandtab' is not set, use TABs */
++       colnr_T     destination_col;    /* column to which text in block will
++                                          be shifted */
++       char_u      *verbatim_copy_end; /* end of the part of the line which is
++                                          copied verbatim */
++       colnr_T     verbatim_copy_width;/* the (displayed) width of this part
++                                          of line */
++       unsigned    fill;               /* nr of spaces that replace a TAB */
++       unsigned    new_line_len;       /* the length of the line after the
++                                          block shift */
++       size_t      block_space_width;
++       size_t      shift_amount;
++       char_u      *non_white = bd.textstart;
++       colnr_T     non_white_col;
+ 
+-       split = bd.startspaces + internal;
+-       if (split > 0)
+-       {
+-           if (!curbuf->b_p_et)
+-           {
+-               for (ptr = oldp, col = 0; ptr < oldp+bd.textcol; )
+-                   col += lbr_chartabsize_adv(&ptr, (colnr_T)col);
++       /*
++        * Firstly, let's find the first non-whitespace character that is
++        * displayed after the block's start column and the character's column
++        * number. Also, let's calculate the width of all the whitespace
++        * characters that are displayed in the block and precede the searched
++        * non-whitespace character.
++        */
+ 
+-               /* col+1 now equals the start col of the first char of the
+-                * block (may be < oap.start_vcol if we're splitting a TAB) */
+-               i = ((col % p_ts) + split) / p_ts; /* number of tabs */
+-           }
+-           if (i)
+-               j = ((col % p_ts) + split) % p_ts; /* number of spp */
+-           else
+-               j = split;
+-       }
++       /* If "bd.startspaces" is set, "bd.textstart" points to the character,
++        * the part of which is displayed at the block's beginning. Let's start
++        * searching from the next character. */
++       if (bd.startspaces)
++           mb_ptr_adv(non_white);
+ 
+-       newp = alloc_check(bd.textcol + i + j + (unsigned)STRLEN(midp) + 1);
+-       if (newp == NULL)
+-           return;
+-       vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + STRLEN(midp) + 1));
++       /* The character's column is in "bd.start_vcol".  */
++       non_white_col = bd.start_vcol;
+ 
+-       /* copy first part we want to keep */
+-       mch_memmove(newp, oldp, (size_t)bd.textcol);
+-       /* Now copy any TABS and spp to ensure correct alignment! */
+-       while (vim_iswhite(*midp))
++       while (vim_iswhite(*non_white))
+        {
+-           if (*midp == TAB)
+-               i++;
+-           else /*space */
+-               j++;
+-           midp++;
++           incr = lbr_chartabsize_adv(&non_white, non_white_col);
++           non_white_col += incr;
+        }
+-       /* We might have an extra TAB worth of spp now! */
+-       if (j / p_ts && !curbuf->b_p_et)
++
++       block_space_width = non_white_col - oap->start_vcol;
++       /* We will shift by "total" or "block_space_width", whichever is less.
++        */
++       shift_amount = (block_space_width < total? block_space_width: total);
++
++       /* The column to which we will shift the text.  */
++       destination_col = non_white_col - shift_amount;
++
++       /* Now let's find out how much of the beginning of the line we can
++        * reuse without modification.  */
++       verbatim_copy_end = bd.textstart;
++       verbatim_copy_width = bd.start_vcol;
++
++       /* If "bd.startspaces" is set, "bd.textstart" points to the character
++        * preceding the block. We have to subtract its width to obtain its
++        * column number.  */
++       if (bd.startspaces)
++           verbatim_copy_width -= bd.start_char_vcols;
++       while (verbatim_copy_width < destination_col)
+        {
+-           i++;
+-           j -= p_ts;
++           incr = lbr_chartabsize(verbatim_copy_end, verbatim_copy_width);
++           if (verbatim_copy_width + incr > destination_col)
++               break;
++           verbatim_copy_width += incr;
++           mb_ptr_adv(verbatim_copy_end);
+        }
+-       copy_chars(newp + bd.textcol, (size_t)i, TAB);
+-       copy_spaces(newp + bd.textcol + i, (size_t)j);
+ 
+-       /* the end */
+-       STRMOVE(newp + STRLEN(newp), midp);
++       /* If "destination_col" is different from the width of the initial
++        * part of the line that will be copied, it means we encountered a tab
++        * character, which we will have to partly replace with spaces.  */
++       fill = destination_col - verbatim_copy_width;
++
++       /* The replacement line will consist of:
++        * - the beginning of the original line up to "verbatim_copy_end",
++        * - "fill" number of spaces,
++        * - the rest of the line, pointed to by non_white.  */
++       new_line_len = (unsigned)(verbatim_copy_end - oldp)
++                      + fill
++                      + (unsigned)STRLEN(non_white) + 1;
++
++       newp = alloc_check(new_line_len);
++       if (newp == NULL)
++           return;
++       mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp));
++       copy_spaces(newp + (verbatim_copy_end - oldp), (size_t)fill);
++       STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white);
+     }
+     /* replace the line */
+     ml_replace(curwin->w_cursor.lnum, newp, FALSE);
+@@ -2209,12 +2230,15 @@
      {
         for (; pos.lnum <= oap->end.lnum; ++pos.lnum)
@@ -4054 +5538 @@
                 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
  
+@@ -4848,7 +4872,8 @@
+  * - textlen includes the first/last char to be (partly) deleted
+  * - start/endspaces is the number of columns that are taken by the
+  *   first/last deleted char minus the number of columns that have to be
+- *   deleted.  for yank and tilde:
++ *   deleted.
++ * for yank and tilde:
+  * - textlen includes the first/last char to be wholly yanked
+  * - start/endspaces is the number of columns of the first/last yanked char
+  *   that are to be yanked.
 diff -Naur vim72.orig/src/option.c vim72/src/option.c
 --- vim72.orig/src/option.c     2008-07-18 06:05:33.000000000 -0700
-+++ vim72/src/option.c  2009-01-19 00:10:29.000000000 -0800
++++ vim72/src/option.c  2009-03-12 11:55:13.683619779 -0700
 @@ -2593,13 +2593,13 @@
  #ifdef FEAT_VIMINFO
@@ -4074 +5568 @@
  #endif
  #else
-@@ -7974,6 +7974,11 @@
+@@ -4119,11 +4119,23 @@
+                                           && options[opt_idx].var == VAR_WIN)
+                goto skip;
+ 
+-           /* Disallow changing some options from modelines */
+-           if ((opt_flags & OPT_MODELINE) && (flags & P_SECURE))
++           /* Disallow changing some options from modelines. */
++           if (opt_flags & OPT_MODELINE)
+            {
+-               errmsg = (char_u *)_("E520: Not allowed in a modeline");
+-               goto skip;
++               if (flags & P_SECURE)
++               {
++                   errmsg = (char_u *)_("E520: Not allowed in a modeline");
++                   goto skip;
++               }
++#ifdef FEAT_DIFF
++               /* In diff mode some options are overruled.  This avoids that
++                * 'foldmethod' becomes "marker" instead of "diff" and that
++                * "wrap" gets set. */
++               if (curwin->w_p_diff
++                       && (options[opt_idx].indir == PV_FDM
++                           || options[opt_idx].indir == PV_WRAP))
++                   goto skip;
++#endif
+            }
+ 
+ #ifdef HAVE_SANDBOX
+@@ -5268,6 +5280,21 @@
+ }
+ #endif
+ 
++#ifdef FEAT_TITLE
++static void redraw_titles __ARGS((void));
++
++/*
++ * Redraw the window title and/or tab page text later.
++ */
++static void redraw_titles()
++{
++    need_maketitle = TRUE;
++# ifdef FEAT_WINDOWS
++    redraw_tabline = TRUE;
++# endif
++}
++#endif
++
+ /*
+  * Set a string option to a new value (without checking the effect).
+  * The string is copied into allocated memory.
+@@ -5407,6 +5434,10 @@
+     int                did_chartab = FALSE;
+     char_u     **gvarp;
+     long_u     free_oldval = (options[opt_idx].flags & P_ALLOCED);
++#ifdef FEAT_GUI
++    /* set when changing an option that only requires a redraw in the GUI */
++    int                redraw_gui_only = FALSE;
++#endif
+ 
+     /* Get the global option to compare with, otherwise we would have to check
+      * two values for all local options. */
+@@ -5668,7 +5699,7 @@
+            {
+ # ifdef FEAT_TITLE
+                /* May show a "+" in the title now. */
+-               need_maketitle = TRUE;
++               redraw_titles();
+ # endif
+                /* Add 'fileencoding' to the swap file. */
+                ml_setflags(curbuf);
+@@ -5687,7 +5718,7 @@
+            {
+                errmsg = mb_init();
+ # ifdef FEAT_TITLE
+-               need_maketitle = TRUE;
++               redraw_titles();
+ # endif
+            }
+        }
+@@ -5766,14 +5797,28 @@
+        /* load or unload key mapping tables */
+        errmsg = keymap_init();
+ 
+-       /* When successfully installed a new keymap switch on using it. */
+-       if (*curbuf->b_p_keymap != NUL && errmsg == NULL)
++       if (errmsg == NULL)
+        {
+-           curbuf->b_p_iminsert = B_IMODE_LMAP;
+-           if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT)
+-               curbuf->b_p_imsearch = B_IMODE_LMAP;
+-           set_iminsert_global();
+-           set_imsearch_global();
++           if (*curbuf->b_p_keymap != NUL)
++           {
++               /* Installed a new keymap, switch on using it. */
++               curbuf->b_p_iminsert = B_IMODE_LMAP;
++               if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT)
++                   curbuf->b_p_imsearch = B_IMODE_LMAP;
++           }
++           else
++           {
++               /* Cleared the keymap, may reset 'iminsert' and 'imsearch'. */
++               if (curbuf->b_p_iminsert == B_IMODE_LMAP)
++                   curbuf->b_p_iminsert = B_IMODE_NONE;
++               if (curbuf->b_p_imsearch == B_IMODE_LMAP)
++                   curbuf->b_p_imsearch = B_IMODE_USE_INSERT;
++           }
++           if ((opt_flags & OPT_LOCAL) == 0)
++           {
++               set_iminsert_global();
++               set_imsearch_global();
++           }
+ # ifdef FEAT_WINDOWS
+            status_redraw_curbuf();
+ # endif
+@@ -5796,7 +5841,7 @@
+            else
+                curbuf->b_p_tx = FALSE;
+ #ifdef FEAT_TITLE
+-           need_maketitle = TRUE;
++           redraw_titles();
+ #endif
+            /* update flag in swap file */
+            ml_setflags(curbuf);
+@@ -6055,6 +6100,7 @@
+                    errmsg = (char_u *)N_("E596: Invalid font(s)");
+            }
+        }
++       redraw_gui_only = TRUE;
+     }
+ # ifdef FEAT_XFONTSET
+     else if (varp == &p_guifontset)
+@@ -6063,6 +6109,7 @@
+            errmsg = (char_u *)N_("E597: can't select fontset");
+        else if (gui.in_use && gui_init_font(p_guifontset, TRUE) != OK)
+            errmsg = (char_u *)N_("E598: Invalid fontset");
++       redraw_gui_only = TRUE;
+     }
+ # endif
+ # ifdef FEAT_MBYTE
+@@ -6072,6 +6119,7 @@
+            errmsg = (char_u *)N_("E533: can't select wide font");
+        else if (gui_get_wide_font() == FAIL)
+            errmsg = (char_u *)N_("E534: Invalid wide font");
++       redraw_gui_only = TRUE;
+     }
+ # endif
+ #endif
+@@ -6133,13 +6181,24 @@
+ #ifdef FEAT_GUI
+     /* 'guioptions' */
+     else if (varp == &p_go)
++    {
+        gui_init_which_components(oldval);
++       redraw_gui_only = TRUE;
++    }
+ #endif
+ 
+ #if defined(FEAT_GUI_TABLINE)
+     /* 'guitablabel' */
+     else if (varp == &p_gtl)
++    {
+        redraw_tabline = TRUE;
++       redraw_gui_only = TRUE;
++    }
++    /* 'guitabtooltip' */
++    else if (varp == &p_gtt)
++    {
++       redraw_gui_only = TRUE;
++    }
+ #endif
+ 
+ #if defined(FEAT_MOUSE_TTY) && (defined(UNIX) || defined(VMS))
+@@ -6717,7 +6776,11 @@
+ 
+     if (curwin->w_curswant != MAXCOL)
+        curwin->w_set_curswant = TRUE;  /* in case 'showbreak' changed */
+-    check_redraw(options[opt_idx].flags);
++#ifdef FEAT_GUI
++    /* check redraw when it's not a GUI option or the GUI is active. */
++    if (!redraw_gui_only || gui.in_use)
++#endif
++       check_redraw(options[opt_idx].flags);
+ 
+     return errmsg;
+ }
+@@ -7105,22 +7168,28 @@
+            curbuf->b_did_warn = FALSE;
+ 
+ #ifdef FEAT_TITLE
+-       need_maketitle = TRUE;
++       redraw_titles();
+ #endif
+     }
+ 
+ #ifdef FEAT_TITLE
+     /* when 'modifiable' is changed, redraw the window title */
+     else if ((int *)varp == &curbuf->b_p_ma)
+-       need_maketitle = TRUE;
++    {
++       redraw_titles();
++    }
+     /* when 'endofline' is changed, redraw the window title */
+     else if ((int *)varp == &curbuf->b_p_eol)
+-       need_maketitle = TRUE;
+-#ifdef FEAT_MBYTE
+-    /* when 'bomb' is changed, redraw the window title */
++    {
++       redraw_titles();
++    }
++# ifdef FEAT_MBYTE
++    /* when 'bomb' is changed, redraw the window title and tab page text */
+     else if ((int *)varp == &curbuf->b_p_bomb)
+-       need_maketitle = TRUE;
+-#endif
++    {
++       redraw_titles();
++    }
++# endif
+ #endif
+ 
+     /* when 'bin' is set also set some other options */
+@@ -7128,7 +7197,7 @@
+     {
+        set_options_bin(old_value, curbuf->b_p_bin, opt_flags);
+ #ifdef FEAT_TITLE
+-       need_maketitle = TRUE;
++       redraw_titles();
+ #endif
+     }
+ 
+@@ -7279,7 +7348,7 @@
+        if (!value)
+            save_file_ff(curbuf);       /* Buffer is unchanged */
+ #ifdef FEAT_TITLE
+-       need_maketitle = TRUE;
++       redraw_titles();
+ #endif
+ #ifdef FEAT_AUTOCMD
+        modified_was_set = value;
+@@ -7714,7 +7783,7 @@
+        newFoldLevel();
+     }
+ 
+-    /* 'foldminlevel' */
++    /* 'foldminlines' */
+     else if (pp == &curwin->w_p_fml)
+     {
+        foldUpdateAll(curwin);
+@@ -7974,6 +8043,11 @@
         else /* curwin->w_p_scr > curwin->w_height */
             curwin->w_p_scr = curwin->w_height;
@@ -4086 +5829 @@
      {
         errmsg = e_positive;
-@@ -8227,13 +8232,13 @@
+@@ -8227,13 +8301,13 @@
             {
                 if (number == 0 && string != NULL)
@@ -4103 +5846 @@
                         /* There's another character after zeros or the string
                          * is empty.  In both cases, we are trying to set a
-@@ -8323,7 +8328,7 @@
+@@ -8323,7 +8397,7 @@
      {
         --arg;                      /* put arg at the '<' */
@@ -4112 +5855 @@
             key = 0;
      }
+@@ -10093,25 +10167,110 @@
+ 
+ #ifdef FEAT_LANGMAP
+ /*
+- * Any character has an equivalent character.  This is used for keyboards that
+- * have a special language mode that sends characters above 128 (although
+- * other characters can be translated too).
++ * Any character has an equivalent 'langmap' character.  This is used for
++ * keyboards that have a special language mode that sends characters above
++ * 128 (although other characters can be translated too).  The "to" field is a
++ * Vim command character.  This avoids having to switch the keyboard back to
++ * ASCII mode when leaving Insert mode.
++ *
++ * langmap_mapchar[] maps any of 256 chars to an ASCII char used for Vim
++ * commands.
++ * When FEAT_MBYTE is defined langmap_mapga.ga_data is a sorted table of
++ * langmap_entry_T.  This does the same as langmap_mapchar[] for characters >=
++ * 256.
+  */
++# ifdef FEAT_MBYTE
++/*
++ * With multi-byte support use growarray for 'langmap' chars >= 256
++ */
++typedef struct
++{
++    int            from;
++    int     to;
++} langmap_entry_T;
++
++static garray_T langmap_mapga;
++static void langmap_set_entry __ARGS((int from, int to));
+ 
+ /*
+- * char_u langmap_mapchar[256];
+- * Normally maps each of the 128 upper chars to an <128 ascii char; used to
+- * "translate" native lang chars in normal mode or some cases of
+- * insert mode without having to tediously switch lang mode back&forth.
++ * Search for an entry in "langmap_mapga" for "from".  If found set the "to"
++ * field.  If not found insert a new entry at the appropriate location.
+  */
++    static void
++langmap_set_entry(from, to)
++    int    from;
++    int    to;
++{
++    langmap_entry_T *entries = (langmap_entry_T *)(langmap_mapga.ga_data);
++    int             a = 0;
++    int             b = langmap_mapga.ga_len;
++
++    /* Do a binary search for an existing entry. */
++    while (a != b)
++    {
++       int i = (a + b) / 2;
++       int d = entries[i].from - from;
++
++       if (d == 0)
++       {
++           entries[i].to = to;
++           return;
++       }
++       if (d < 0)
++           a = i + 1;
++       else
++           b = i;
++    }
++
++    if (ga_grow(&langmap_mapga, 1) != OK)
++       return;  /* out of memory */
++
++    /* insert new entry at position "a" */
++    entries = (langmap_entry_T *)(langmap_mapga.ga_data) + a;
++    mch_memmove(entries + 1, entries,
++                       (langmap_mapga.ga_len - a) * sizeof(langmap_entry_T));
++    ++langmap_mapga.ga_len;
++    entries[0].from = from;
++    entries[0].to = to;
++}
++
++/*
++ * Apply 'langmap' to multi-byte character "c" and return the result.
++ */
++    int
++langmap_adjust_mb(c)
++    int c;
++{
++    langmap_entry_T *entries = (langmap_entry_T *)(langmap_mapga.ga_data);
++    int a = 0;
++    int b = langmap_mapga.ga_len;
++
++    while (a != b)
++    {
++       int i = (a + b) / 2;
++       int d = entries[i].from - c;
++
++       if (d == 0)
++           return entries[i].to;  /* found matching entry */
++       if (d < 0)
++           a = i + 1;
++       else
++           b = i;
++    }
++    return c;  /* no entry found, return "c" unmodified */
++}
++# endif
+ 
+     static void
+ langmap_init()
+ {
+     int i;
+ 
+-    for (i = 0; i < 256; i++)          /* we init with a-one-to one map */
+-       langmap_mapchar[i] = i;
++    for (i = 0; i < 256; i++)
++       langmap_mapchar[i] = i;  /* we init with a one-to-one map */
++# ifdef FEAT_MBYTE
++    ga_init2(&langmap_mapga, sizeof(langmap_entry_T), 8);
++# endif
+ }
+ 
+ /*
+@@ -10125,7 +10284,10 @@
+     char_u  *p2;
+     int            from, to;
+ 
+-    langmap_init();                        /* back to one-to-one map first */
++#ifdef FEAT_MBYTE
++    ga_clear(&langmap_mapga);              /* clear the previous map first */
++#endif
++    langmap_init();                        /* back to one-to-one map */
+ 
+     for (p = p_langmap; p[0] != NUL; )
+     {
+@@ -10175,7 +10337,13 @@
+                                                             transchar(from));
+                return;
+            }
+-           langmap_mapchar[from & 255] = to;
++
++#ifdef FEAT_MBYTE
++           if (from >= 256)
++               langmap_set_entry(from, to);
++           else
++#endif
++               langmap_mapchar[from & 255] = to;
+ 
+            /* Advance to next pair */
+            mb_ptr_adv(p);
 diff -Naur vim72.orig/src/os_unix.c vim72/src/os_unix.c
 --- vim72.orig/src/os_unix.c    2008-08-06 04:01:40.000000000 -0700
-+++ vim72/src/os_unix.c 2009-01-19 00:09:40.000000000 -0800
-@@ -315,12 +315,15 @@
++++ vim72/src/os_unix.c 2009-03-12 11:55:13.671618662 -0700
+@@ -181,7 +181,8 @@
+        && defined(FEAT_TITLE) && !defined(FEAT_GUI_GTK)
+ # define SET_SIG_ALARM
+ static RETSIGTYPE sig_alarm __ARGS(SIGPROTOARG);
+-static int sig_alarm_called;
++/* volatile because it is used in signal handler sig_alarm(). */
++static volatile int sig_alarm_called;
+ #endif
+ static RETSIGTYPE deathtrap __ARGS(SIGPROTOARG);
+ 
+@@ -201,13 +202,16 @@
+ # define SIG_ERR       ((RETSIGTYPE (*)())-1)
+ #endif
+ 
+-static int     do_resize = FALSE;
++/* volatile because it is used in signal handler sig_winch(). */
++static volatile int do_resize = FALSE;
+ #ifndef __EMX__
+ static char_u  *extra_shell_arg = NULL;
+ static int     show_shell_mess = TRUE;
+ #endif
+-static int     deadly_signal = 0;          /* The signal we caught */
+-static int     in_mch_delay = FALSE;       /* sleeping in mch_delay() */
++/* volatile because it is used in signal handler deathtrap(). */
++static volatile int deadly_signal = 0;     /* The signal we caught */
++/* volatile because it is used in signal handler deathtrap(). */
++static volatile int in_mch_delay = FALSE;    /* sleeping in mch_delay() */
+ 
+ static int curr_tmode = TMODE_COOK;    /* contains current terminal mode */
+ 
+@@ -315,12 +319,15 @@
      {-1,           "Unknown!", FALSE}
  };
@@ -4132 +6052 @@
         RealWaitForChar(read_cmd_fd, p_wd, NULL);
  }
-@@ -2905,7 +2908,7 @@
+@@ -799,7 +806,7 @@
+ #endif
+ 
+ /*
+- * We need correct potatotypes for a signal function, otherwise mean compilers
++ * We need correct prototypes for a signal function, otherwise mean compilers
+  * will barf when the second argument to signal() is ``wrong''.
+  * Let me try it with a few tricky defines from my own osdef.h (jw).
+  */
+@@ -1065,13 +1072,18 @@
+     SIGRETURN;
+ }
+ 
+-#ifdef _REENTRANT
++#if defined(_REENTRANT) && defined(SIGCONT)
+ /*
+  * On Solaris with multi-threading, suspending might not work immediately.
+  * Catch the SIGCONT signal, which will be used as an indication whether the
+  * suspending has been done or not.
++ *
++ * On Linux, signal is not always handled immediately either.
++ * See https://bugs.launchpad.net/bugs/291373
++ *
++ * volatile because it is used in in signal handler sigcont_handler().
+  */
+-static int sigcont_received;
++static volatile int sigcont_received;
+ static RETSIGTYPE sigcont_handler __ARGS(SIGPROTOARG);
+ 
+ /*
+@@ -1115,15 +1127,28 @@
+     }
+ # endif
+ 
+-# ifdef _REENTRANT
++# if defined(_REENTRANT) && defined(SIGCONT)
+     sigcont_received = FALSE;
+ # endif
+     kill(0, SIGTSTP);      /* send ourselves a STOP signal */
+-# ifdef _REENTRANT
+-    /* When we didn't suspend immediately in the kill(), do it now.  Happens
+-     * on multi-threaded Solaris. */
+-    if (!sigcont_received)
+-       pause();
++# if defined(_REENTRANT) && defined(SIGCONT)
++    /*
++     * Wait for the SIGCONT signal to be handled. It generally happens
++     * immediately, but somehow not all the time. Do not call pause()
++     * because there would be race condition which would hang Vim if
++     * signal happened in between the test of sigcont_received and the
++     * call to pause(). If signal is not yet received, call sleep(0)
++     * to just yield CPU. Signal should then be received. If somehow
++     * it's still not received, sleep 1, 2, 3 ms. Don't bother waiting
++     * further if signal is not received after 1+2+3+4 ms (not expected
++     * to happen).
++     */
++    {
++       long wait;
++       for (wait = 0; !sigcont_received && wait <= 3L; wait++)
++           /* Loop is not entered most of the time */
++           mch_delay(wait, FALSE);
++    }
+ # endif
+ 
+ # ifdef FEAT_TITLE
+@@ -1172,7 +1197,7 @@
+ #ifdef SIGTSTP
+     signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL);
+ #endif
+-#ifdef _REENTRANT
++#if defined(_REENTRANT) && defined(SIGCONT)
+     signal(SIGCONT, sigcont_handler);
+ #endif
+ 
+@@ -1231,7 +1256,7 @@
+ reset_signals()
+ {
+     catch_signals(SIG_DFL, SIG_DFL);
+-#ifdef _REENTRANT
++#if defined(_REENTRANT) && defined(SIGCONT)
+     /* SIGCONT isn't in the list, because its default action is ignore */
+     signal(SIGCONT, SIG_DFL);
+ #endif
+@@ -2905,7 +2930,7 @@
       * Ignore any errors.
       */
@@ -4141 +6144 @@
  #endif
  }
-@@ -2936,7 +2939,8 @@
+@@ -2936,7 +2961,8 @@
      }
  #  endif
@@ -4151 +6154 @@
  #  ifdef FEAT_XCLIPBOARD
             && x11_display != xterm_dpy
-@@ -3926,9 +3930,9 @@
+@@ -3926,9 +3952,9 @@
                  */
                 if (fd >= 0)
@@ -4164 +6167 @@
                     /* Don't need this now that we've duplicated it */
                     close(fd);
-@@ -3996,13 +4000,13 @@
+@@ -3946,7 +3972,17 @@
+                 * children can be kill()ed.  Don't do this when using pipes,
+                 * because stdin is not a tty, we would lose /dev/tty. */
+                if (p_stmp)
++               {
+                    (void)setsid();
++#  if defined(SIGHUP)
++                   /* When doing "!xterm&" and 'shell' is bash: the shell
++                    * will exit and send SIGHUP to all processes in its
++                    * group, killing the just started process.  Ignore SIGHUP
++                    * to avoid that. (suggested by Simon Schubert)
++                    */
++                   signal(SIGHUP, SIG_IGN);
++#  endif
++               }
+ # endif
+ # ifdef FEAT_GUI
+                if (pty_slave_fd >= 0)
+@@ -3996,13 +4032,13 @@
  
                     /* set up stdin/stdout/stderr for the child */
@@ -4181 +6202 @@
  
                     close(pty_slave_fd);    /* has been dupped, close it now */
-@@ -4013,13 +4017,13 @@
+@@ -4013,13 +4049,13 @@
                     /* set up stdin for the child */
                     close(fd_toshell[1]);
@@ -4197 +6218 @@
  
  # ifdef FEAT_GUI
-@@ -4027,7 +4031,7 @@
+@@ -4027,7 +4063,7 @@
                     {
                         /* set up stderr for the child */
@@ -4206 +6227 @@
  # endif
                 }
-@@ -4158,7 +4162,8 @@
+@@ -4078,6 +4114,9 @@
+                int         fromshell_fd;
+                garray_T    ga;
+                int         noread_cnt;
++# if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)
++               struct timeval  start_tv;
++# endif
+ 
+ # ifdef FEAT_GUI
+                if (pty_master_fd >= 0)
+@@ -4158,7 +4197,8 @@
                                             && (lnum !=
                                                     curbuf->b_ml.ml_line_count
@@ -4216 +6247 @@
                                 if (lnum > curbuf->b_op_end.lnum)
                                 {
-@@ -6814,7 +6819,8 @@
+@@ -4186,7 +4226,9 @@
+                    ga_init2(&ga, 1, BUFLEN);
+ 
+                noread_cnt = 0;
+-
++# if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)
++               gettimeofday(&start_tv, NULL);
++# endif
+                for (;;)
+                {
+                    /*
+@@ -4199,25 +4241,34 @@
+                     * that a typed password is echoed for ssh or gpg command.
+                     * Don't get characters when the child has already
+                     * finished (wait_pid == 0).
+-                    * Don't get extra characters when we already have one.
+                     * Don't read characters unless we didn't get output for a
+-                    * while, avoids that ":r !ls" eats typeahead.
++                    * while (noread_cnt > 4), avoids that ":r !ls" eats
++                    * typeahead.
+                     */
+                    len = 0;
+                    if (!(options & SHELL_EXPAND)
+                            && ((options &
+                                         (SHELL_READ|SHELL_WRITE|SHELL_COOKED))
+                                      != (SHELL_READ|SHELL_WRITE|SHELL_COOKED)
+-#ifdef FEAT_GUI
++# ifdef FEAT_GUI
+                                                    || gui.in_use
+-#endif
++# endif
+                                                    )
+                            && wait_pid == 0
+-                           && (ta_len > 0
+-                               || (noread_cnt > 4
+-                                   && (len = ui_inchar(ta_buf,
+-                                                      BUFLEN, 10L, 0)) > 0)))
++                           && (ta_len > 0 || noread_cnt > 4))
+                    {
++                     if (ta_len == 0)
++                     {
++                         /* Get extra characters when we don't have any.
++                          * Reset the counter and timer. */
++                         noread_cnt = 0;
++# if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)
++                         gettimeofday(&start_tv, NULL);
++# endif
++                         len = ui_inchar(ta_buf, BUFLEN, 10L, 0);
++                     }
++                     if (ta_len > 0 || len > 0)
++                     {
+                        /*
+                         * For pipes:
+                         * Check for CTRL-C: send interrupt signal to child.
+@@ -4319,9 +4370,9 @@
+                            {
+                                ta_len -= len;
+                                mch_memmove(ta_buf, ta_buf + len, ta_len);
+-                               noread_cnt = 0;
+                            }
+                        }
++                     }
+                    }
+ 
+                    if (got_int)
+@@ -4429,6 +4480,25 @@
+                        out_flush();
+                        if (got_int)
+                            break;
++
++# if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)
++                       {
++                           struct timeval  now_tv;
++                           long            msec;
++
++                           /* Avoid that we keep looping here without
++                            * checking for a CTRL-C for a long time.  Don't
++                            * break out too often to avoid losing typeahead. */
++                           gettimeofday(&now_tv, NULL);
++                           msec = (now_tv.tv_sec - start_tv.tv_sec) * 1000L
++                               + (now_tv.tv_usec - start_tv.tv_usec) / 1000L;
++                           if (msec > 2000)
++                           {
++                               noread_cnt = 5;
++                               break;
++                           }
++                       }
++# endif
+                    }
+ 
+                    /* If we already detected the child has finished break the
+@@ -5851,7 +5921,9 @@
+             * we are going to suspend or starting an external process
+             * so we shouldn't  have problem with this
+             */
++# ifdef SIGTSTP
+            signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL);
++# endif
+            return 1; /* succeed */
+        }
+        if (gpm_fd == -2)
+@@ -6814,7 +6886,8 @@
      if (xsmp_icefd != -1)
      {
@@ -4228 +6360 @@
 diff -Naur vim72.orig/src/proto/eval.pro vim72/src/proto/eval.pro
 --- vim72.orig/src/proto/eval.pro       2008-08-09 07:31:25.000000000 -0700
-+++ vim72/src/proto/eval.pro    2009-01-19 00:09:18.000000000 -0800
++++ vim72/src/proto/eval.pro    2009-03-12 11:54:47.005909205 -0700
 @@ -17,7 +17,7 @@
  int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip));
@@ -4270 +6402 @@
 diff -Naur vim72.orig/src/proto/ex_cmds.pro vim72/src/proto/ex_cmds.pro
 --- vim72.orig/src/proto/ex_cmds.pro    2008-08-09 07:31:25.000000000 -0700
-+++ vim72/src/proto/ex_cmds.pro 2009-01-19 00:08:31.000000000 -0800
++++ vim72/src/proto/ex_cmds.pro 2009-03-12 11:55:13.611614471 -0700
 @@ -11,7 +11,7 @@
  char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
@@ -4280 +6412 @@
  int viminfo_readline __ARGS((vir_T *virp));
  char_u *viminfo_readstring __ARGS((vir_T *virp, int off, int convert));
+@@ -40,6 +40,7 @@
+ int read_viminfo_sub_string __ARGS((vir_T *virp, int force));
+ void write_viminfo_sub_string __ARGS((FILE *fp));
+ void free_old_sub __ARGS((void));
++void free_signs __ARGS((void));
+ int prepare_tagpreview __ARGS((int undo_sync));
+ void ex_help __ARGS((exarg_T *eap));
+ char_u *check_help_lang __ARGS((char_u *arg));
 diff -Naur vim72.orig/src/proto/ex_getln.pro vim72/src/proto/ex_getln.pro
 --- vim72.orig/src/proto/ex_getln.pro   2008-08-09 07:31:28.000000000 -0700
-+++ vim72/src/proto/ex_getln.pro        2009-01-19 00:09:28.000000000 -0800
-@@ -31,7 +31,7 @@
++++ vim72/src/proto/ex_getln.pro        2009-03-12 11:55:13.703620617 -0700
+@@ -4,6 +4,7 @@
+ int text_locked __ARGS((void));
+ void text_locked_msg __ARGS((void));
+ int curbuf_locked __ARGS((void));
++int allbuf_locked __ARGS((void));
+ char_u *getexline __ARGS((int c, void *dummy, int indent));
+ char_u *getexmodeline __ARGS((int promptc, void *dummy, int indent));
+ int cmdline_overstrike __ARGS((void));
+@@ -31,7 +32,7 @@
  void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col));
  int expand_cmdline __ARGS((expand_T *xp, char_u *str, int col, int *matchcount, char_u ***matches));
@@ -4294 +6442 @@
 diff -Naur vim72.orig/src/proto/mark.pro vim72/src/proto/mark.pro
 --- vim72.orig/src/proto/mark.pro       2008-08-09 07:31:36.000000000 -0700
-+++ vim72/src/proto/mark.pro    2009-01-19 00:08:31.000000000 -0800
++++ vim72/src/proto/mark.pro    2009-03-12 11:54:40.553496578 -0700
 @@ -26,5 +26,5 @@
  void write_viminfo_filemarks __ARGS((FILE *fp));
@@ -4304 +6452 @@
 diff -Naur vim72.orig/src/proto/misc2.pro vim72/src/proto/misc2.pro
 --- vim72.orig/src/proto/misc2.pro      2008-08-09 07:31:40.000000000 -0700
-+++ vim72/src/proto/misc2.pro   2009-01-19 00:10:29.000000000 -0800
++++ vim72/src/proto/misc2.pro   2009-03-12 11:54:56.454515435 -0700
 @@ -59,7 +59,7 @@
  int handle_x_keys __ARGS((int key));
@@ -4316 +6464 @@
 diff -Naur vim72.orig/src/proto/netbeans.pro vim72/src/proto/netbeans.pro
 --- vim72.orig/src/proto/netbeans.pro   2008-08-09 07:31:56.000000000 -0700
-+++ vim72/src/proto/netbeans.pro        2009-01-19 00:10:45.000000000 -0800
++++ vim72/src/proto/netbeans.pro        2009-03-12 11:54:59.854733063 -0700
 @@ -11,7 +11,7 @@
  void netbeans_frame_moved __ARGS((int new_x, int new_y));
@@ -4326 +6474 @@
  void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len));
  void netbeans_unmodified __ARGS((buf_T *bufp));
+diff -Naur vim72.orig/src/proto/option.pro vim72/src/proto/option.pro
+--- vim72.orig/src/proto/option.pro     2008-08-09 07:31:43.000000000 -0700
++++ vim72/src/proto/option.pro  2009-03-12 11:55:13.419602459 -0700
+@@ -44,6 +44,7 @@
+ void set_context_in_set_cmd __ARGS((expand_T *xp, char_u *arg, int opt_flags));
+ int ExpandSettings __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file));
+ int ExpandOldSetting __ARGS((int *num_file, char_u ***file));
++int langmap_adjust_mb __ARGS((int c));
+ int has_format_option __ARGS((int x));
+ int shortmess __ARGS((int x));
+ void vimrc_found __ARGS((char_u *fname, char_u *envname));
 diff -Naur vim72.orig/src/pty.c vim72/src/pty.c
 --- vim72.orig/src/pty.c        2008-06-21 11:52:58.000000000 -0700
-+++ vim72/src/pty.c     2009-01-19 00:07:02.000000000 -0800
++++ vim72/src/pty.c     2009-03-12 11:54:28.844744238 -0700
 @@ -270,9 +270,10 @@
  }
@@ -4342 +6501 @@
      int
  OpenPTY(ttyn)
+diff -Naur vim72.orig/src/quickfix.c vim72/src/quickfix.c
+--- vim72.orig/src/quickfix.c   2008-07-18 05:53:02.000000000 -0700
++++ vim72/src/quickfix.c        2009-03-12 11:55:13.547610560 -0700
+@@ -1419,6 +1419,7 @@
+     int                        opened_window = FALSE;
+     win_T              *win;
+     win_T              *altwin;
++    int                        flags;
+ #endif
+     int                        print_message = TRUE;
+     int                        len;
+@@ -1530,7 +1531,6 @@
+     if (qf_ptr->qf_type == 1 && (!curwin->w_buffer->b_help || cmdmod.tab != 0))
+     {
+        win_T   *wp;
+-       int     n;
+ 
+        if (cmdmod.tab != 0)
+            wp = NULL;
+@@ -1546,13 +1546,16 @@
+             * Split off help window; put it at far top if no position
+             * specified, the current window is vertically split and narrow.
+             */
+-           n = WSP_HELP;
++           flags = WSP_HELP;
+ # ifdef FEAT_VERTSPLIT
+            if (cmdmod.split == 0 && curwin->w_width != Columns
+                                                      && curwin->w_width < 80)
+-               n |= WSP_TOP;
++               flags |= WSP_TOP;
+ # endif
+-           if (win_split(0, n) == FAIL)
++           if (qi != &ql_info)
++               flags |= WSP_NEWLOC;  /* don't copy the location list */
++
++           if (win_split(0, flags) == FAIL)
+                goto theend;
+            opened_window = TRUE;       /* close it when fail */
+ 
+@@ -1562,7 +1565,6 @@
+            if (qi != &ql_info)     /* not a quickfix list */
+            {
+                /* The new window should use the supplied location list */
+-               qf_free_all(curwin);
+                curwin->w_llist = qi;
+                qi->qf_refcount++;
+            }
+@@ -1609,10 +1611,11 @@
+                {
+                    goto_tabpage_win(tp, wp);
+                    usable_win = 1;
+-                   break;
++                   goto win_found;
+                }
+            }
+        }
++win_found:
+ 
+        /*
+         * If there is only one window and it is the quickfix window, create a
+@@ -1622,7 +1625,10 @@
+        {
+            ll_ref = curwin->w_llist_ref;
+ 
+-           if (win_split(0, WSP_ABOVE) == FAIL)
++           flags = WSP_ABOVE;
++           if (ll_ref != NULL)
++               flags |= WSP_NEWLOC;
++           if (win_split(0, flags) == FAIL)
+                goto failed;            /* not enough room for window */
+            opened_window = TRUE;       /* close it when fail */
+            p_swb = empty_option;       /* don't split again */
+@@ -1634,7 +1640,6 @@
+            {
+                /* The new window should use the location list from the
+                 * location list window */
+-               qf_free_all(curwin);
+                curwin->w_llist = ll_ref;
+                ll_ref->qf_refcount++;
+            }
+@@ -2307,15 +2312,12 @@
+        if (eap->cmdidx == CMD_copen || eap->cmdidx == CMD_cwindow)
+            /* Create the new window at the very bottom. */
+            win_goto(lastwin);
+-       if (win_split(height, WSP_BELOW) == FAIL)
++       if (win_split(height, WSP_BELOW | WSP_NEWLOC) == FAIL)
+            return;             /* not enough room for window */
+ #ifdef FEAT_SCROLLBIND
+        curwin->w_p_scb = FALSE;
+ #endif
+ 
+-       /* Remove the location list for the quickfix window */
+-       qf_free_all(curwin);
+-
+        if (eap->cmdidx == CMD_lopen || eap->cmdidx == CMD_lwindow)
+        {
+            /*
+diff -Naur vim72.orig/src/regexp.c vim72/src/regexp.c
+--- vim72.orig/src/regexp.c     2008-08-07 12:58:50.000000000 -0700
++++ vim72/src/regexp.c  2009-03-12 11:55:13.471605532 -0700
+@@ -4532,7 +4532,7 @@
+                cleanup_subexpr();
+                if (!REG_MULTI)         /* Single-line regexp */
+                {
+-                   if (reg_endp[no] == NULL)
++                   if (reg_startp[no] == NULL || reg_endp[no] == NULL)
+                    {
+                        /* Backref was not set: Match an empty string. */
+                        len = 0;
+@@ -4548,7 +4548,7 @@
+                }
+                else                            /* Multi-line regexp */
+                {
+-                   if (reg_endpos[no].lnum < 0)
++                   if (reg_startpos[no].lnum < 0 || reg_endpos[no].lnum < 0)
+                    {
+                        /* Backref was not set: Match an empty string. */
+                        len = 0;
+@@ -7279,13 +7279,11 @@
+     }
+     else
+     {
+-       if (submatch_match->endp[no] == NULL)
++       s = submatch_match->startp[no];
++       if (s == NULL || submatch_match->endp[no] == NULL)
+            retval = NULL;
+        else
+-       {
+-           s = submatch_match->startp[no];
+            retval = vim_strnsave(s, (int)(submatch_match->endp[no] - s));
+-       }
+     }
+ 
+     return retval;
 diff -Naur vim72.orig/src/screen.c vim72/src/screen.c
 --- vim72.orig/src/screen.c     2008-07-24 07:45:07.000000000 -0700
-+++ vim72/src/screen.c  2009-01-19 00:08:07.000000000 -0800
++++ vim72/src/screen.c  2009-03-12 11:55:39.893297947 -0700
 @@ -2439,9 +2439,17 @@
  
@@ -4366 +6659 @@
  
      SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp),
+@@ -2588,6 +2596,7 @@
+     int                noinvcur = FALSE;       /* don't invert the cursor */
+ #ifdef FEAT_VISUAL
+     pos_T      *top, *bot;
++    int                lnum_in_visual_area = FALSE;
+ #endif
+     pos_T      pos;
+     long       v;
+@@ -2784,9 +2793,10 @@
+            top = &VIsual;
+            bot = &curwin->w_cursor;
+        }
++       lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum);
+        if (VIsual_mode == Ctrl_V)      /* block mode */
+        {
+-           if (lnum >= top->lnum && lnum <= bot->lnum)
++           if (lnum_in_visual_area)
+            {
+                fromcol = wp->w_old_cursor_fcol;
+                tocol = wp->w_old_cursor_lcol;
+@@ -3412,6 +3422,7 @@
+                        && (*mb_ptr2cells)(ptr) > 1)
+ #endif
+                    || ((int)vcol_prev == fromcol_prev
++                       && vcol_prev < vcol     /* not at margin */
+                        && vcol < tocol))
+                area_attr = attr;               /* start highlighting */
+            else if (area_attr != 0
+@@ -3544,7 +3555,8 @@
+                /* Use line_attr when not in the Visual or 'incsearch' area
+                 * (area_attr may be 0 when "noinvcur" is set). */
+            else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL)
+-                                       || (vcol < fromcol || vcol >= tocol)))
++                               || vcol < fromcol || vcol_prev < fromcol_prev
++                               || vcol >= tocol))
+                char_attr = line_attr;
+ #endif
+            else
+@@ -4549,7 +4561,8 @@
+         * highlight the cursor position itself. */
+        if (wp->w_p_cuc && vcol == (long)wp->w_virtcol
+                && lnum != wp->w_cursor.lnum
+-               && draw_state == WL_LINE)
++               && draw_state == WL_LINE
++               && !lnum_in_visual_area)
+        {
+            vcol_save_attr = char_attr;
+            char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUC));
+@@ -5119,8 +5132,8 @@
+ #endif
+ 
+ #if defined(FEAT_GUI) || defined(UNIX)
+-           /* The bold trick makes a single row of pixels appear in the next
+-            * character.  When a bold character is removed, the next
++           /* The bold trick makes a single column of pixels appear in the
++            * next character.  When a bold character is removed, the next
+             * character should be redrawn too.  This happens for our own GUI
+             * and for some xterms. */
+            if (
+@@ -6263,9 +6276,15 @@
+     int                pcc[MAX_MCO];
+ # endif
+ #endif
++#if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX)
++    int                force_redraw_this;
++    int                force_redraw_next = FALSE;
++#endif
++    int                need_redraw;
+ 
+     if (ScreenLines == NULL || row >= screen_Rows)     /* safety check */
+        return;
++    off = LineOffset[row] + col;
+ 
+ #ifdef FEAT_MBYTE
+     /* When drawing over the right halve of a double-wide char clear out the
+@@ -6275,10 +6294,21 @@
+            && !gui.in_use
+ # endif
+            && mb_fix_col(col, row) != col)
+-       screen_puts_len((char_u *)" ", 1, row, col - 1, 0);
++    {
++       ScreenLines[off - 1] = ' ';
++       ScreenAttrs[off - 1] = 0;
++       if (enc_utf8)
++       {
++           ScreenLinesUC[off - 1] = 0;
++           ScreenLinesC[0][off - 1] = 0;
++       }
++       /* redraw the previous cell, make it empty */
++       screen_char(off - 1, row, col - 1);
++       /* force the cell at "col" to be redrawn */
++       force_redraw_next = TRUE;
++    }
+ #endif
+ 
+-    off = LineOffset[row] + col;
+ #ifdef FEAT_MBYTE
+     max_off = LineOffset[row] + screen_Columns;
+ #endif
+@@ -6342,7 +6372,12 @@
+        }
+ #endif
+ 
+-       if (ScreenLines[off] != c
++#if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX)
++       force_redraw_this = force_redraw_next;
++       force_redraw_next = FALSE;
++#endif
++
++       need_redraw = ScreenLines[off] != c
+ #ifdef FEAT_MBYTE
+                || (mbyte_cells == 2
+                    && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0))
+@@ -6350,24 +6385,24 @@
+                    && c == 0x8e
+                    && ScreenLines2[off] != ptr[1])
+                || (enc_utf8
+-                   && (ScreenLinesUC[off] != (u8char_T)u8c
++                   && (ScreenLinesUC[off] != (u8char_T)(c >= 0x80 ? u8c : 0)
+                        || screen_comp_differs(off, u8cc)))
+ #endif
+                || ScreenAttrs[off] != attr
+-               || exmode_active
++               || exmode_active;
++
++       if (need_redraw
++#if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX)
++               || force_redraw_this
++#endif
+                )
+        {
+ #if defined(FEAT_GUI) || defined(UNIX)
+            /* The bold trick makes a single row of pixels appear in the next
+             * character.  When a bold character is removed, the next
+             * character should be redrawn too.  This happens for our own GUI
+-            * and for some xterms.
+-            * Force the redraw by setting the attribute to a different value
+-            * than "attr", the contents of ScreenLines[] may be needed by
+-            * mb_off2cells() further on.
+-            * Don't do this for the last drawn character, because the next
+-            * character may not be redrawn. */
+-           if (
++            * and for some xterms. */
++           if (need_redraw && ScreenLines[off] != ' ' && (
+ # ifdef FEAT_GUI
+                    gui.in_use
+ # endif
+@@ -6377,23 +6412,14 @@
+ # ifdef UNIX
+                    term_is_xterm
+ # endif
+-              )
++                   ))
+            {
+-               int             n;
++               int     n = ScreenAttrs[off];
+ 
+-               n = ScreenAttrs[off];
+-# ifdef FEAT_MBYTE
+-               if (col + mbyte_cells < screen_Columns
+-                       && (n > HL_ALL || (n & HL_BOLD))
+-                       && (len < 0 ? ptr[mbyte_blen] != NUL
+-                                            : ptr + mbyte_blen < text + len))
+-                   ScreenAttrs[off + mbyte_cells] = attr + 1;
+-# else
+-               if (col + 1 < screen_Columns
+-                       && (n > HL_ALL || (n & HL_BOLD))
+-                       && (len < 0 ? ptr[1] != NUL : ptr + 1 < text + len))
+-                   ScreenLines[off + 1] = 0;
+-# endif
++               if (n > HL_ALL)
++                   n = syn_attr2attr(n);
++               if (n & HL_BOLD)
++                   force_redraw_next = TRUE;
+            }
+ #endif
+ #ifdef FEAT_MBYTE
+@@ -6480,6 +6506,20 @@
+            ++ptr;
+        }
+     }
++
++#if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX)
++    /* If we detected the next character needs to be redrawn, but the text
++     * doesn't extend up to there, update the character here. */
++    if (force_redraw_next && col < screen_Columns)
++    {
++# ifdef FEAT_MBYTE
++       if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1)
++           screen_char_2(off, row, col);
++       else
++# endif
++           screen_char(off, row, col);
++    }
++#endif
+ }
+ 
+ #ifdef FEAT_SEARCH_EXTRA
+@@ -7356,7 +7396,11 @@
+ #endif
+     static int     entered = FALSE;            /* avoid recursiveness */
+     static int     done_outofmem_msg = FALSE;  /* did outofmem message */
++#ifdef FEAT_AUTOCMD
++    int                    retry_count = 0;
+ 
++retry:
++#endif
+     /*
+      * Allocation of the screen buffers is done only when the size changes and
+      * when Rows and Columns have been set and we have started doing full
+@@ -7440,10 +7484,13 @@
+        {
+            outofmem = TRUE;
+ #ifdef FEAT_WINDOWS
+-           break;
++           goto give_up;
+ #endif
+        }
+     }
++#ifdef FEAT_WINDOWS
++give_up:
++#endif
+ 
+ #ifdef FEAT_MBYTE
+     for (i = 0; i < p_mco; ++i)
+@@ -7628,8 +7675,17 @@
+     --RedrawingDisabled;
+ 
+ #ifdef FEAT_AUTOCMD
+-    if (starting == 0)
++    /*
++     * Do not apply autocommands more than 3 times to avoid an endless loop
++     * in case applying autocommands always changes Rows or Columns.
++     */
++    if (starting == 0 && ++retry_count <= 3)
++    {
+        apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf);
++       /* In rare cases, autocommands may have altered Rows or Columns,
++        * jump back to check if we need to allocate the screen again. */
++       goto retry;
++    }
+ #endif
+ }
+ 
 diff -Naur vim72.orig/src/spell.c vim72/src/spell.c
 --- vim72.orig/src/spell.c      2008-07-12 12:20:55.000000000 -0700
-+++ vim72/src/spell.c   2009-01-19 00:10:18.000000000 -0800
++++ vim72/src/spell.c   2009-03-12 11:55:13.363596871 -0700
 @@ -77,7 +77,7 @@
  
@@ -4569 +7106 @@
   * ID in "flags" for the word "word".
   * The WF_RAREPFX flag is included in the return value for a rare prefix.
+@@ -2237,7 +2376,7 @@
+ 
+            /* If we are back at the starting line and there is no match then
+             * give up. */
+-           if (lnum == wp->w_cursor.lnum && !found_one)
++           if (lnum == wp->w_cursor.lnum && (!found_one || wrapped))
+                break;
+ 
+            /* Skip the characters at the start of the next line that were
 @@ -2513,9 +2652,11 @@
      lp->sl_midword = NULL;
@@ -4633 +7179 @@
      vim_free(pat);
      if (slang->sl_compprog == NULL)
-@@ -4915,6 +5080,7 @@
+@@ -4791,13 +4956,16 @@
+  * Structure that is used to store the items in the word tree.  This avoids
+  * the need to keep track of each allocated thing, everything is freed all at
+  * once after ":mkspell" is done.
++ * Note: "sb_next" must be just before "sb_data" to make sure the alignment of
++ * "sb_data" is correct for systems where pointers must be aligned on
++ * pointer-size boundaries and sizeof(pointer) > sizeof(int) (e.g., Sparc).
+  */
+ #define  SBLOCKSIZE 16000      /* size of sb_data */
+ typedef struct sblock_S sblock_T;
+ struct sblock_S
+ {
+-    sblock_T   *sb_next;       /* next block in list */
+     int                sb_used;        /* nr of bytes already in use */
++    sblock_T   *sb_next;       /* next block in list */
+     char_u     sb_data[1];     /* data, actually longer */
+ };
+ 
+@@ -4915,6 +5083,7 @@
  } spellinfo_T;
  
@@ -4641 +7205 @@
  static int spell_info_item __ARGS((char_u *s));
  static unsigned affitem2flag __ARGS((int flagtype, char_u *item, char_u        *fname, int lnum));
-@@ -4950,7 +5116,7 @@
+@@ -4950,7 +5119,7 @@
  static void put_sugtime __ARGS((spellinfo_T *spin, FILE *fd));
  static int write_vim_spell __ARGS((spellinfo_T *spin, char_u *fname));
@@ -4650 +7214 @@
  static int sug_filltree __ARGS((spellinfo_T *spin, slang_T *slang));
  static int sug_maketable __ARGS((spellinfo_T *spin));
-@@ -5223,8 +5389,7 @@
+@@ -5223,8 +5392,7 @@
         /* Handle non-empty lines. */
         if (itemcnt > 0)
@@ -4660 +7224 @@
  #ifdef FEAT_MBYTE
                 /* Setup for conversion from "ENC" to 'encoding'. */
-@@ -5239,7 +5404,7 @@
+@@ -5239,7 +5407,7 @@
                     smsg((char_u *)_("Conversion in %s not supported"), fname);
  #endif
@@ -4669 +7233 @@
             {
                 if (STRCMP(items[1], "long") == 0)
-@@ -5284,69 +5449,71 @@
+@@ -5284,69 +5452,71 @@
                         spin->si_info = p;
                     }
@@ -4757 +7321 @@
                 aff->af_compforbid = affitem2flag(aff->af_flagtype, items[1],
                                                                  fname, lnum);
-@@ -5354,8 +5521,8 @@
+@@ -5354,8 +5524,8 @@
                     smsg((char_u *)_("Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line %d"),
                             fname, lnum);
@@ -4768 +7332 @@
                 aff->af_comppermit = affitem2flag(aff->af_flagtype, items[1],
                                                                  fname, lnum);
-@@ -5363,7 +5530,7 @@
+@@ -5363,7 +5533,7 @@
                     smsg((char_u *)_("Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line %d"),
                             fname, lnum);
@@ -4777 +7341 @@
             {
                 /* Turn flag "c" into COMPOUNDRULE compatible string "c+",
-@@ -5376,7 +5543,15 @@
+@@ -5376,7 +5546,15 @@
                     compflags = p;
                 }
@@ -4794 +7358 @@
                 /* Concatenate this string to previously defined ones, using a
                  * slash to separate them. */
-@@ -5395,7 +5570,7 @@
+@@ -5395,7 +5573,7 @@
                     compflags = p;
                 }
@@ -4803 +7367 @@
             {
                 compmax = atoi((char *)items[1]);
-@@ -5403,7 +5578,7 @@
+@@ -5403,7 +5581,7 @@
                     smsg((char_u *)_("Wrong COMPOUNDWORDMAX value in %s line %d: %s"),
                                                        fname, lnum, items[1]);
@@ -4812 +7376 @@
             {
                 compminlen = atoi((char *)items[1]);
-@@ -5411,7 +5586,7 @@
+@@ -5411,7 +5589,7 @@
                     smsg((char_u *)_("Wrong COMPOUNDMIN value in %s line %d: %s"),
                                                        fname, lnum, items[1]);
@@ -4821 +7385 @@
             {
                 compsylmax = atoi((char *)items[1]);
-@@ -5419,32 +5594,29 @@
+@@ -5419,32 +5597,29 @@
                     smsg((char_u *)_("Wrong COMPOUNDSYLMAX value in %s line %d: %s"),
                                                        fname, lnum, items[1]);
@@ -4860 +7424 @@
                 garray_T    *gap = &spin->si_comppat;
                 int         i;
-@@ -5463,24 +5635,24 @@
+@@ -5463,24 +5638,24 @@
                                                = getroom_save(spin, items[2]);
                 }
@@ -4890 +7454 @@
                 aff->af_pfxpostpone = TRUE;
             }
-@@ -5771,24 +5943,20 @@
+@@ -5771,24 +5946,20 @@
                     }
                 }
@@ -4920 +7484 @@
                 /* Ignore REP/REPSAL count */;
                 if (!isdigit(*items[1]))
-@@ -5819,7 +5987,7 @@
+@@ -5819,7 +5990,7 @@
                                          : &spin->si_rep, items[1], items[2]);
                 }
@@ -4929 +7493 @@
                 /* MAP item or count */
                 if (!found_map)
-@@ -5856,9 +6024,8 @@
+@@ -5856,9 +6027,8 @@
                     ga_append(&spin->si_map, '/');
                 }
@@ -4941 +7505 @@
                 if (do_sal)
                 {
-@@ -5877,12 +6044,12 @@
+@@ -5877,12 +6047,12 @@
                                                                 : items[2]);
                 }
@@ -4956 +7520 @@
             {
                 sofoto = getroom_save(spin, items[1]);
-@@ -5980,7 +6147,7 @@
+@@ -5980,7 +6150,7 @@
         else if (spin->si_newprefID == 0 || spin->si_newprefID == 127)
             MSG(_("Too many compound flags"));
@@ -4965 +7529 @@
  
      if (syllable != NULL)
-@@ -6017,6 +6184,22 @@
+@@ -6017,6 +6187,22 @@
  }
  
@@ -4988 +7552 @@
   * ae_flags to ae_comppermit and ae_compforbid.
   */
-@@ -7926,6 +8109,8 @@
+@@ -7926,6 +8112,8 @@
      char_u     *p;
      int                rr;
@@ -4997 +7561 @@
      fd = mch_fopen((char *)fname, "w");
      if (fd == NULL)
-@@ -7936,11 +8121,11 @@
+@@ -7936,11 +8124,11 @@
  
      /* <HEADER>: <fileID> <versionnr> */
@@ -5014 +7578 @@
  
      /*
-@@ -7955,7 +8140,7 @@
+@@ -7955,7 +8143,7 @@
  
         i = (int)STRLEN(spin->si_info);
@@ -5023 +7587 @@
  
      /* SN_REGION: <regionname> ...
-@@ -7966,7 +8151,7 @@
+@@ -7966,7 +8154,7 @@
         putc(SNF_REQUIRED, fd);                         /* <sectionflags> */
         l = spin->si_region_count * 2;
@@ -5032 +7596 @@
         regionmask = (1 << spin->si_region_count) - 1;
      }
-@@ -8016,7 +8201,7 @@
+@@ -8016,7 +8204,7 @@
         }
  
@@ -5041 +7605 @@
  
      /* SN_MIDWORD: <midword> */
-@@ -8027,7 +8212,8 @@
+@@ -8027,7 +8215,8 @@
  
         i = (int)STRLEN(spin->si_midword);
@@ -5051 +7615 @@
  
      /* SN_PREFCOND: <prefcondcnt> <prefcond> ... */
-@@ -8113,7 +8299,8 @@
+@@ -8113,7 +8302,8 @@
                 p = rr == 1 ? ftp->ft_from : ftp->ft_to;
                 l = (int)STRLEN(p);
@@ -5061 +7625 @@
         }
  
-@@ -8131,11 +8318,11 @@
+@@ -8131,11 +8321,11 @@
                                                         /* <sectionlen> */
  
@@ -5075 +7639 @@
  
      /* SN_WORDS: <word> ...
-@@ -8160,7 +8347,7 @@
+@@ -8160,7 +8350,7 @@
                     l = (int)STRLEN(hi->hi_key) + 1;
                     len += l;
@@ -5084 +7648 @@
                 }
             if (round == 1)
-@@ -8176,7 +8363,7 @@
+@@ -8176,7 +8366,7 @@
         putc(0, fd);                                    /* <sectionflags> */
         l = spin->si_map.ga_len;
@@ -5093 +7657 @@
      }
  
-@@ -8232,10 +8419,11 @@
+@@ -8232,10 +8422,11 @@
         {
             p = ((char_u **)(spin->si_comppat.ga_data))[i];
@@ -5107 +7671 @@
      }
  
-@@ -8259,7 +8447,8 @@
+@@ -8259,7 +8450,8 @@
  
         l = (int)STRLEN(spin->si_syllable);
@@ -5117 +7681 @@
  
      /* end of <SECTIONS> */
-@@ -8295,13 +8484,18 @@
+@@ -8295,13 +8487,18 @@
         (void)put_node(fd, tree, 0, regionmask, round == 3);
      }
@@ -5138 +7702 @@
  }
  
-@@ -9890,6 +10084,7 @@
+@@ -9890,6 +10087,7 @@
      char_u     *p;
      int                len;
@@ -5146 +7710 @@
      if (fd != NULL)
         put_bytes(fd, (long_u)gap->ga_len, 2);      /* <prefcondcnt> */
-@@ -9906,7 +10101,7 @@
+@@ -9906,7 +10104,7 @@
             if (fd != NULL)
             {
@@ -5155 +7719 @@
             totlen += len;
         }
-@@ -11480,15 +11675,24 @@
+@@ -11480,15 +11678,24 @@
                     vim_strncpy(preword + sp->ts_prewordlen,
                             tword + sp->ts_splitoff,
@@ -5187 +7751 @@
                     p = preword + sp->ts_prewordlen;
                     mb_ptr_back(preword, p);
-@@ -11685,10 +11889,9 @@
+@@ -11685,10 +11892,9 @@
                         && (slang->sl_compsylmax < MAXWLEN
                             || sp->ts_complen + 1 - sp->ts_compsplit
@@ -5201 +7765 @@
                     try_compound = TRUE;
                     compflags[sp->ts_complen] = ((unsigned)flags >> 24);
+@@ -14808,7 +15014,7 @@
+ 
+        case 0:
+            /*
+-            * Lenghts are equal, thus changes must result in same length: An
++            * Lengths are equal, thus changes must result in same length: An
+             * insert is only possible in combination with a delete.
+             * 1: check if for identical strings
+             */
 diff -Naur vim72.orig/src/structs.h vim72/src/structs.h
 --- vim72.orig/src/structs.h    2008-07-30 13:02:50.000000000 -0700
-+++ vim72/src/structs.h 2009-01-19 00:09:02.000000000 -0800
++++ vim72/src/structs.h 2009-03-12 11:54:46.913903059 -0700
 @@ -459,7 +459,7 @@
  typedef struct
@@ -5232 +7805 @@
 diff -Naur vim72.orig/src/tag.c vim72/src/tag.c
 --- vim72.orig/src/tag.c        2008-07-16 14:31:30.000000000 -0700
-+++ vim72/src/tag.c     2009-01-19 00:10:57.000000000 -0800
++++ vim72/src/tag.c     2009-03-12 11:55:13.591613075 -0700
 @@ -515,7 +515,7 @@
              * If a count is supplied to the ":tag <name>" command, then
@@ -5242 +7815 @@
  
             if (type == DT_SELECT || type == DT_JUMP
-@@ -2725,7 +2725,24 @@
+@@ -618,7 +618,7 @@
+                taglen_advance(taglen);
+                MSG_PUTS_ATTR(_("file\n"), hl_attr(HLF_T));
+ 
+-               for (i = 0; i < num_matches; ++i)
++               for (i = 0; i < num_matches && !got_int; ++i)
+                {
+                    parse_match(matches[i], &tagp);
+                    if (!new_tag && (
+@@ -655,6 +655,8 @@
+                    }
+                    if (msg_col > 0)
+                        msg_putchar('\n');
++                   if (got_int)
++                       break;
+                    msg_advance(15);
+ 
+                    /* print any extra fields */
+@@ -689,6 +691,8 @@
+                                if (msg_col + ptr2cells(p) >= Columns)
+                                {
+                                    msg_putchar('\n');
++                                   if (got_int)
++                                       break;
+                                    msg_advance(15);
+                                }
+                                p = msg_outtrans_one(p, attr);
+@@ -704,6 +708,8 @@
+                        if (msg_col > 15)
+                        {
+                            msg_putchar('\n');
++                           if (got_int)
++                               break;
+                            msg_advance(15);
+                        }
+                    }
+@@ -734,6 +740,8 @@
+                    {
+                        if (msg_col + (*p == TAB ? 1 : ptr2cells(p)) > Columns)
+                            msg_putchar('\n');
++                       if (got_int)
++                           break;
+                        msg_advance(15);
+ 
+                        /* skip backslash used for escaping command char */
+@@ -760,12 +768,9 @@
+                    if (msg_col)
+                        msg_putchar('\n');
+                    ui_breakcheck();
+-                   if (got_int)
+-                   {
+-                       got_int = FALSE;        /* only stop the listing */
+-                       break;
+-                   }
+                }
++               if (got_int)
++                   got_int = FALSE;    /* only stop the listing */
+                ask_for_selection = TRUE;
+            }
+ #if defined(FEAT_QUICKFIX) && defined(FEAT_EVAL)
+@@ -2542,6 +2547,15 @@
+ {
+     ga_clear_strings(&tag_fnames);
+     do_tag(NULL, DT_FREE, 0, 0, 0);
++    tag_freematch();
++
++# if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
++    if (ptag_entry.tagname)
++    {
++        vim_free(ptag_entry.tagname);
++        ptag_entry.tagname = NULL;
++    }
++# endif
+ }
+ #endif
+ 
+@@ -2725,7 +2739,24 @@
          */
         p_7f = vim_strchr(lbuf, 0x7f);
@@ -5267 +7916 @@
         /* Find ^A.  If not found the line number is after the 0x7f */
         p = vim_strchr(p_7f, Ctrl_A);
-@@ -2735,7 +2752,7 @@
+@@ -2735,7 +2766,7 @@
             ++p;
  
@@ -5276 +7925 @@
  
  
-@@ -2749,7 +2766,7 @@
+@@ -2749,7 +2780,7 @@
             /* find end of tagname */
             for (p = p_7f - 1; !vim_iswordc(*p); --p)
@@ -5285 +7934 @@
             while (p >= lbuf && vim_iswordc(*p))
                 --p;
+diff -Naur vim72.orig/src/term.c vim72/src/term.c
+--- vim72.orig/src/term.c       2008-07-27 04:48:06.000000000 -0700
++++ vim72/src/term.c    2009-03-12 11:54:59.914737254 -0700
+@@ -4920,7 +4920,15 @@
+        key_name[0] = KEY2TERMCAP0(key);
+        key_name[1] = KEY2TERMCAP1(key);
+        if (key_name[0] == KS_KEY)
+-           string[new_slen++] = key_name[1];   /* from ":set <M-b>=xx" */
++       {
++           /* from ":set <M-b>=xx" */
++#ifdef FEAT_MBYTE
++           if (has_mbyte)
++               new_slen += (*mb_char2bytes)(key_name[1], string + new_slen);
++           else
++#endif
++               string[new_slen++] = key_name[1];
++       }
+        else
+        {
+            string[new_slen++] = K_SPECIAL;
+diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile
+--- vim72.orig/src/testdir/Makefile     2008-06-19 13:29:46.000000000 -0700
++++ vim72/src/testdir/Makefile  2009-03-12 11:55:27.544506216 -0700
+@@ -20,21 +20,23 @@
+                test48.out test49.out test51.out test52.out test53.out \
+                test54.out test55.out test56.out test57.out test58.out \
+                test59.out test60.out test61.out test62.out test63.out \
+-               test64.out test65.out
++               test64.out test65.out test66.out
+ 
+ SCRIPTS_GUI = test16.out
+ 
+ .SUFFIXES: .in .out
+ 
+-nongui:        nolog $(SCRIPTS)
+-       @echo
+-       @cat test.log
+-       @echo ALL DONE
++nongui:        nolog $(SCRIPTS) report
++
++gui:   nolog $(SCRIPTS) $(SCRIPTS_GUI) report
+ 
+-gui:   nolog $(SCRIPTS) $(SCRIPTS_GUI)
++report:
+        @echo
+-       @cat test.log
+-       @echo ALL DONE
++       @echo 'Test results:'
++       @/bin/sh -c "if test -f test.log; \
++               then cat test.log; echo TEST FAILURE; exit 1; \
++               else echo ALL DONE; \
++               fi"
+ 
+ $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
+ 
+@@ -71,4 +73,4 @@
+ test60.out: test60.vim
+ 
+ nolog:
+-       -echo Test results: >test.log
++       -rm -f test.log
 diff -Naur vim72.orig/src/testdir/Make_ming.mak vim72/src/testdir/Make_ming.mak
 --- vim72.orig/src/testdir/Make_ming.mak        1969-12-31 16:00:00.000000000 -0800
-+++ vim72/src/testdir/Make_ming.mak     2009-01-19 00:08:05.000000000 -0800
++++ vim72/src/testdir/Make_ming.mak     2009-03-12 11:54:40.397486521 -0700
 @@ -0,0 +1,91 @@
 +# Makefile to run tests for Vim, on Dos-like machines
@@ -5380 +8090 @@
 +       -$(DEL) test.ok
 +       -$(DEL) viminfo
-diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile
---- vim72.orig/src/testdir/Makefile     2008-06-19 13:29:46.000000000 -0700
-+++ vim72/src/testdir/Makefile  2009-01-19 00:07:44.000000000 -0800
-@@ -26,15 +26,17 @@
- 
- .SUFFIXES: .in .out
- 
--nongui:        nolog $(SCRIPTS)
--       @echo
--       @cat test.log
--       @echo ALL DONE
-+nongui:        nolog $(SCRIPTS) report
-+
-+gui:   nolog $(SCRIPTS) $(SCRIPTS_GUI) report
- 
--gui:   nolog $(SCRIPTS) $(SCRIPTS_GUI)
-+report:
-        @echo
--       @cat test.log
--       @echo ALL DONE
-+       @echo 'Test results:'
-+       @/bin/sh -c "if test -f test.log; \
-+               then cat test.log; echo TEST FAILURE; exit 1; \
-+               else echo ALL DONE; \
-+               fi"
- 
- $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
- 
-@@ -71,4 +73,4 @@
- test60.out: test60.vim
- 
- nolog:
--       -echo Test results: >test.log
-+       -rm -f test.log
 diff -Naur vim72.orig/src/testdir/test42.ok vim72/src/testdir/test42.ok
 --- vim72.orig/src/testdir/test42.ok    2008-02-20 04:27:37.000000000 -0800
-+++ vim72/src/testdir/test42.ok 2009-01-19 00:08:36.000000000 -0800
++++ vim72/src/testdir/test42.ok 2009-03-12 11:54:40.601499372 -0700
 @@ -20,7 +20,7 @@
  ucs-2
@@ -5426 +8102 @@
  ucs-2le
  
+diff -Naur vim72.orig/src/testdir/test66.in vim72/src/testdir/test66.in
+--- vim72.orig/src/testdir/test66.in    1969-12-31 16:00:00.000000000 -0800
++++ vim72/src/testdir/test66.in 2009-03-12 11:55:27.544506216 -0700
+@@ -0,0 +1,25 @@
++
++Test for visual block shift and tab characters.
++
++STARTTEST
++:so small.vim
++/^abcdefgh
++4jI    j<<11|D
++7|a            
++7|a               
++7|a            4k13|4j<
++:$-4,$w! test.out
++:$-4,$s/\s\+//g
++4kI    j<<
++7|a            
++7|a                                    
++7|a                    4k13|4j3<
++:$-4,$w >> test.out
++:qa!
++ENDTEST
++
++abcdefghijklmnopqrstuvwxyz
++abcdefghijklmnopqrstuvwxyz
++abcdefghijklmnopqrstuvwxyz
++abcdefghijklmnopqrstuvwxyz
++abcdefghijklmnopqrstuvwxyz
+diff -Naur vim72.orig/src/testdir/test66.ok vim72/src/testdir/test66.ok
+--- vim72.orig/src/testdir/test66.ok    1969-12-31 16:00:00.000000000 -0800
++++ vim72/src/testdir/test66.ok 2009-03-12 11:55:27.544506216 -0700
+@@ -0,0 +1,10 @@
++    abcdefghijklmnopqrstuvwxyz
++abcdefghij
++    abc            defghijklmnopqrstuvwxyz
++    abc            defghijklmnopqrstuvwxyz
++    abc            defghijklmnopqrstuvwxyz
++    abcdefghijklmnopqrstuvwxyz
++abcdefghij
++    abc            defghijklmnopqrstuvwxyz
++    abc                defghijklmnopqrstuvwxyz
++    abc            defghijklmnopqrstuvwxyz
 diff -Naur vim72.orig/src/ui.c vim72/src/ui.c
 --- vim72.orig/src/ui.c 2008-07-14 11:14:56.000000000 -0700
-+++ vim72/src/ui.c      2009-01-19 00:09:40.000000000 -0800
++++ vim72/src/ui.c      2009-03-12 11:54:50.158111748 -0700
 @@ -1820,7 +1820,7 @@
  #ifdef HAVE_DUP
@@ -5536 +8255 @@
 diff -Naur vim72.orig/src/version.c vim72/src/version.c
 --- vim72.orig/src/version.c    2008-08-09 07:24:52.000000000 -0700
-+++ vim72/src/version.c 2009-01-19 00:10:59.000000000 -0800
-@@ -677,9 +677,176 @@
++++ vim72/src/version.c 2009-03-12 11:55:39.893297947 -0700
+@@ -677,9 +677,280 @@
  static int included_patches[] =
  {   /* Add new patch number below this line */
  /**/
++    141,
++/**/
++    140,
++/**/
++    139,
++/**/
++    137,
++/**/
++    136,
++/**/
++    135,
++/**/
++    134,
++/**/
++    133,
++/**/
++    132,
++/**/
++    131,
++/**/
++    130,
++/**/
++    129,
++/**/
++    128,
++/**/
++    127,
++/**/
++    126,
++/**/
++    125,
++/**/
++    124,
++/**/
++    123,
++/**/
++    122,
++/**/
++    121,
++/**/
++    120,
++/**/
++    119,
++/**/
++    118,
++/**/
++    117,
++/**/
++    116,
++/**/
++    115,
++/**/
++    114,
++/**/
++    113,
++/**/
++    112,
++/**/
++    111,
++/**/
++    110,
++/**/
++    109,
++/**/
++    108,
++/**/
++    107,
++/**/
++    106,
++/**/
++    105,
++/**/
++    104,
++/**/
++    103,
++/**/
++    102,
++/**/
++    100,
++/**/
++    99,
++/**/
++    98,
++/**/
++    97,
++/**/
++    96,
++/**/
++    95,
++/**/
++    94,
++/**/
++    92,
++/**/
++    91,
++/**/
++    90,
++/**/
++    87,
++/**/
++    86,
++/**/
++    85,
++/**/
 +    84,
 +/**/
@@ -5714 +8537 @@
  highest_patch()
  {
-@@ -786,7 +953,7 @@
+@@ -786,7 +1057,7 @@
      MSG_PUTS(_("\nRISC OS version"));
  #endif
@@ -5723 +8546 @@
      if (*compiled_arch != NUL)
      {
-@@ -825,6 +992,19 @@
+@@ -825,6 +1096,19 @@
         }
      }
@@ -5745 +8568 @@
 diff -Naur vim72.orig/src/vim.h vim72/src/vim.h
 --- vim72.orig/src/vim.h        2008-08-09 09:03:38.000000000 -0700
-+++ vim72/src/vim.h     2009-01-19 00:09:15.000000000 -0800
++++ vim72/src/vim.h     2009-03-12 11:55:13.547610560 -0700
 @@ -341,8 +341,14 @@
  #ifdef BACKSLASH_IN_FILENAME
@@ -5772 +8595 @@
  typedef unsigned long __w64    long_u;
  typedef                 long __w64     long_i;
-@@ -1728,7 +1734,8 @@
+@@ -1051,6 +1057,7 @@
+ #define WSP_HELP       16      /* creating the help window */
+ #define WSP_BELOW      32      /* put new window below/right */
+ #define WSP_ABOVE      64      /* put new window above/left */
++#define WSP_NEWLOC     128     /* don't copy location list */
+ 
+ /*
+  * arguments for gui_set_shellsize()
+@@ -1728,7 +1735,8 @@
  #define VV_MOUSE_COL   51
  #define VV_OP          52
@@ -5782 +8613 @@
  #ifdef FEAT_CLIPBOARD
  
-@@ -1979,6 +1986,9 @@
+@@ -1979,6 +1987,9 @@
  # endif
  #endif
@@ -5792 +8623 @@
  # include "nbdebug.h"
  #else
-@@ -2054,4 +2064,10 @@
+@@ -2054,4 +2065,10 @@
  #define DOSO_VIMRC     1       /* loading vimrc file */
  #define DOSO_GVIMRC    2       /* loading gvimrc file */
@@ -5805 +8636 @@
 diff -Naur vim72.orig/src/window.c vim72/src/window.c
 --- vim72.orig/src/window.c     2008-08-06 04:00:30.000000000 -0700
-+++ vim72/src/window.c  2009-01-19 00:09:40.000000000 -0800
-@@ -4028,14 +4028,14 @@
++++ vim72/src/window.c  2009-03-12 11:55:13.547610560 -0700
+@@ -12,7 +12,7 @@
+ static int path_is_url __ARGS((char_u *p));
+ #if defined(FEAT_WINDOWS) || defined(PROTO)
+ static int win_split_ins __ARGS((int size, int flags, win_T *newwin, int dir));
+-static void win_init __ARGS((win_T *newp, win_T *oldp));
++static void win_init __ARGS((win_T *newp, win_T *oldp, int flags));
+ static void frame_comp_pos __ARGS((frame_T *topfrp, int *row, int *col));
+ static void frame_setheight __ARGS((frame_T *curfrp, int height));
+ #ifdef FEAT_VERTSPLIT
+@@ -593,9 +593,7 @@
+                ++allow_keys;   /* no mapping for xchar, but allow key codes */
+                if (xchar == NUL)
+                    xchar = plain_vgetc();
+-#ifdef FEAT_LANGMAP
+                LANGMAP_ADJUST(xchar, TRUE);
+-#endif
+                --no_mapping;
+                --allow_keys;
+ #ifdef FEAT_CMDL_INFO
+@@ -912,7 +910,7 @@
+            return FAIL;
+ 
+        /* make the contents of the new window the same as the current one */
+-       win_init(wp, curwin);
++       win_init(wp, curwin, flags);
+     }
+ 
+     /*
+@@ -1161,11 +1159,15 @@
+  * Initialize window "newp" from window "oldp".
+  * Used when splitting a window and when creating a new tab page.
+  * The windows will both edit the same buffer.
++ * WSP_NEWLOC may be specified in flags to prevent the location list from
++ * being copied.
+  */
++/*ARGSUSED*/
+     static void
+-win_init(newp, oldp)
++win_init(newp, oldp, flags)
+     win_T      *newp;
+     win_T      *oldp;
++    int                 flags;
+ {
+     int                i;
+ 
+@@ -1190,7 +1192,14 @@
+     copy_jumplist(oldp, newp);
+ #endif
+ #ifdef FEAT_QUICKFIX
+-    copy_loclist(oldp, newp);
++    if (flags & WSP_NEWLOC)
++    {
++       /* Don't copy the location list.  */
++       newp->w_llist = NULL;
++       newp->w_llist_ref = NULL;
++    }
++    else
++       copy_loclist(oldp, newp);
+ #endif
+     if (oldp->w_localdir != NULL)
+        newp->w_localdir = vim_strsave(oldp->w_localdir);
+@@ -3220,7 +3229,7 @@
+     else
+     {
+        /* First window in new tab page, initialize it from "oldwin". */
+-       win_init(curwin, oldwin);
++       win_init(curwin, oldwin, 0);
+ 
+ # ifdef FEAT_SCROLLBIND
+        /* We don't want scroll-binding in the first window. */
+@@ -4028,14 +4037,14 @@
             if (mch_dirname(cwd, MAXPATHL) == OK)
                 globaldir = vim_strsave(cwd);
@@ -5826 +8727 @@
 diff -Naur vim72.orig/src/workshop.c vim72/src/workshop.c
 --- vim72.orig/src/workshop.c   2008-06-21 11:53:26.000000000 -0700
-+++ vim72/src/workshop.c        2009-01-19 00:09:33.000000000 -0800
++++ vim72/src/workshop.c        2009-03-12 11:54:50.062104763 -0700
 @@ -1121,8 +1121,12 @@
                                       ? (char *)curbuf->b_sfname : "<None>");