Changeset 734faf3 in clfs-sysroot for patches

Timestamp:

Jul 26, 2009, 11:16:51 AM (15 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

master

Children:

63c7a69

Parents:

c6124b0

Message:

Updated the Vim Branch Update patch to -19.

File:

• patches/vim-7.2-branch_update-19.patch (moved) (moved from patches/vim-7.2-branch_update-15.patch ) (509 diffs)

patches/vim-7.2-branch_update-19.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 06-05-2009
+Date: 07-19-2009
 Initial Package Version: 7.2
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 7.2.196
+Description: Contains all upstream patches up to 7.2.234
              The following patches were skipped
-             007 036 041 049 071 072 074 088 089 093 101 138 150 172 173 191 194
+             007 036 041 049 071 072 074 088 089 093 101 138 150 172 173 191 194 204 205 212 216 219 233
 
 diff -Naur vim72.orig/Filelist vim72/Filelist
 --- vim72.orig/Filelist 2008-07-06 11:02:23.000000000 -0700
-+++ vim72/Filelist      2009-06-05 14:26:12.000000000 -0700
++++ vim72/Filelist      2009-07-19 15:17:20.000000000 -0700
 @@ -285,6 +285,7 @@
                 src/proto/os_win32.pro \
@@ -31 +31 @@
 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-06-05 14:16:09.000000000 -0700
++++ vim72/runtime/doc/cmdline.txt       2009-07-19 15:19:00.000000000 -0700
 @@ -1,4 +1,4 @@
 -*cmdline.txt*   For Vim version 7.2.  Last change: 2008 Jul 29
@@ -50 +50 @@
                 Implementation detail: When using the |expression| register
                 and invoking setcmdpos(), this sets the position before
-@@ -730,19 +735,29 @@
+@@ -436,13 +441,20 @@
+ those files with an extension that is in the 'suffixes' option are ignored.
+ The default is ".bak,~,.o,.h,.info,.swp,.obj", which means that files ending
+ in ".bak", "~", ".o", ".h", ".info", ".swp" and ".obj" are sometimes ignored.
+-It is impossible to ignore suffixes with two dots.  Examples:
++
++An empty entry, two consecutive commas, match a file name that does not
++contain a ".", thus has no suffix.  This is useful to ignore "prog" and prefer
++"prog.c".
++
++Examples:
+ 
+   pattern:     files:                          match:  ~
+    test*       test.c test.h test.o            test.c
+    test*       test.h test.o                   test.h and test.o
+    test*       test.i test.h test.c            test.i and test.c
+ 
++It is impossible to ignore suffixes with two dots.
++
+ If there is more than one matching file (after ignoring the ones matching
+ the 'suffixes' option) the first file name is inserted.  You can see that
+ there is only one match when you type 'wildchar' twice and the completed
+@@ -730,19 +742,29 @@
  In Ex commands, at places where a file name can be used, the following
  characters have a special meaning.  These can also be used in the expression
@@ -90 +112 @@
 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-06-05 14:23:32.000000000 -0700
++++ vim72/runtime/doc/eval.txt  2009-07-19 15:15:05.000000000 -0700
 @@ -1,4 +1,4 @@
 -*eval.txt*     For Vim version 7.2.  Last change: 2008 Aug 09
@@ -226 +248 @@
 diff -Naur vim72.orig/runtime/doc/if_cscop.txt vim72/runtime/doc/if_cscop.txt
 --- vim72.orig/runtime/doc/if_cscop.txt 2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/if_cscop.txt      2009-06-05 14:23:20.000000000 -0700
++++ vim72/runtime/doc/if_cscop.txt      2009-07-19 15:18:44.000000000 -0700
 @@ -1,4 +1,4 @@
 -*if_cscop.txt*  For Vim version 7.2.  Last change: 2005 Mar 29
@@ -258 +280 @@
             :cscope find 0 DEFAULT_TERM
  <
+@@ -344,13 +355,8 @@
+ The DJGPP-built version from http://cscope.sourceforge.net is known to not
+ work with Vim.
+ 
+-There are a couple of hard-coded limitations:
+-
+-    1. The maximum number of cscope connections allowed is 8.  Do you
+-    really need more?
+-
+-    2. Doing a |:tjump| when |:cstag| searches the tag files is not
+-    configurable (e.g., you can't do a tselect instead).
++Hard-coded limitation: doing a |:tjump| when |:cstag| searches the tag files
++is not configurable (e.g., you can't do a tselect instead).
+ 
+ ==============================================================================
+ 6. Suggested usage                                     *cscope-suggestions*
 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-06-05 14:19:24.000000000 -0700
++++ vim72/runtime/doc/netbeans.txt      2009-07-19 15:12:02.000000000 -0700
 @@ -1,4 +1,4 @@
 -*netbeans.txt*  For Vim version 7.2.  Last change: 2008 Jun 28
@@ -282 +320 @@
 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-06-05 14:21:21.000000000 -0700
++++ vim72/runtime/doc/options.txt       2009-07-19 15:17:33.000000000 -0700
 @@ -1,4 +1,4 @@
 -*options.txt*  For Vim version 7.2.  Last change: 2008 Aug 06
@@ -289 +327 @@
  
                   VIM REFERENCE MANUAL    by Bram Moolenaar
-@@ -4175,9 +4175,6 @@
+@@ -1443,6 +1443,14 @@
+        autoselectml    Like "autoselect", but for the modeless selection
+                        only.  Compare to the 'A' flag in 'guioptions'.
+ 
++       html            When the clipboard contains HTML, use this when
++                       pasting.  When putting text on the clipboard, mark it
++                       as HTML.  This works to copy rendered HTML from
++                       Firefox, paste it as raw HTML in Vim, select the HTML
++                       in Vim and paste it in a rich edit box in Firefox.
++                       Only supported for GTK version 2 and later.
++                       Only available with the |+multi_byte| feature.
++
+        exclude:{pattern}
+                        Defines a pattern that is matched against the name of
+                        the terminal 'term'.  If there is a match, no
+@@ -4175,9 +4183,6 @@
         be able to execute Normal mode commands.
         This is the opposite of the 'keymap' option, where characters are
@@ -300 +353 @@
             :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 @@
+@@ -7472,7 +7477,9 @@
                         {not available when compiled without the |+wildignore|
                         feature}
@@ -313 +366 @@
 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-06-05 14:18:12.000000000 -0700
++++ vim72/runtime/doc/spell.txt 2009-07-19 15:11:11.000000000 -0700
 @@ -1,4 +1,4 @@
 -*spell.txt*    For Vim version 7.2.  Last change: 2008 Jun 21
@@ -443 +496 @@
 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-06-05 14:16:09.000000000 -0700
++++ vim72/runtime/doc/starting.txt      2009-07-19 15:09:53.000000000 -0700
 @@ -1,4 +1,4 @@
 -*starting.txt*  For Vim version 7.2.  Last change: 2008 Jun 21
@@ -505 +558 @@
 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-06-05 14:16:09.000000000 -0700
++++ vim72/runtime/doc/usr_21.txt        2009-07-19 15:09:53.000000000 -0700
 @@ -1,4 +1,4 @@
 -*usr_21.txt*   For Vim version 7.2.  Last change: 2007 May 01
@@ -570 +623 @@
  
  You can use the ":wviminfo" and ":rviminfo" commands to save and restore the
+diff -Naur vim72.orig/runtime/doc/various.txt vim72/runtime/doc/various.txt
+--- vim72.orig/runtime/doc/various.txt  2008-08-09 07:23:01.000000000 -0700
++++ vim72/runtime/doc/various.txt       2009-07-19 15:18:31.000000000 -0700
+@@ -508,6 +508,17 @@
+                        messages though.  Use ":silent" in the command itself
+                        to avoid that: ":silent menu .... :silent command".
+ 
++                                               *:uns* *:unsilent*
++:uns[ilent] {command}  Execute {command} not silently.  Only makes a
++                       difference when |:silent| was used to get to this
++                       command.
++                       Use this for giving a message even when |:silent| was
++                       used.  In this example |:silent| is used to avoid the
++                       message about reading the file and |:unsilent| to be
++                       able to list the first line of each file. >
++               :silent argdo unsilent echo expand('%') . ": " . getline(1)
++<
++
+                                                *:verb* *:verbose*
+ :[count]verb[ose] {command}
+                        Execute {command} with 'verbose' set to [count].  If
 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-06-05 14:14:19.000000000 -0700
++++ vim72/runtime/scripts.vim   2009-07-19 15:08:47.000000000 -0700
 @@ -234,6 +234,10 @@
    elseif s:line1 =~ '\<DTD\s\+XHTML\s'
@@ -586 +660 @@
 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-06-05 14:25:31.000000000 -0700
++++ vim72/src/auto/configure    2009-07-19 15:16:46.000000000 -0700
 @@ -1,6 +1,6 @@
  #! /bin/sh
@@ -1946 +2020 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/buffer.c  2009-07-19 15:16:33.000000000 -0700
 @@ -44,6 +44,7 @@
  #ifdef FEAT_TITLE
@@ -2473 +2547 @@
 diff -Naur vim72.orig/src/charset.c vim72/src/charset.c
 --- vim72.orig/src/charset.c    2008-07-24 07:59:44.000000000 -0700
-+++ vim72/src/charset.c 2009-06-05 14:24:27.000000000 -0700
++++ vim72/src/charset.c 2009-07-19 15:15:54.000000000 -0700
 @@ -17,7 +17,7 @@
  static int win_nolbr_chartabsize __ARGS((win_T *wp, char_u *s, colnr_T col, int *headp));
@@ -2562 +2636 @@
 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-06-05 14:25:31.000000000 -0700
++++ vim72/src/config.h.in       2009-07-19 15:16:46.000000000 -0700
 @@ -36,6 +36,9 @@
  /* Defined to the size of an int */
@@ -2585 +2659 @@
 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-06-05 14:25:31.000000000 -0700
++++ vim72/src/configure.in      2009-07-19 15:16:46.000000000 -0700
 @@ -1193,6 +1193,28 @@
  
@@ -2713 +2787 @@
 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-06-05 14:24:34.000000000 -0700
++++ vim72/src/diff.c    2009-07-19 15:16:00.000000000 -0700
 @@ -8,7 +8,7 @@
   */
@@ -2916 +2990 @@
 diff -Naur vim72.orig/src/digraph.c vim72/src/digraph.c
 --- vim72.orig/src/digraph.c    2008-06-23 14:12:51.000000000 -0700
-+++ vim72/src/digraph.c 2009-06-05 14:24:27.000000000 -0700
++++ vim72/src/digraph.c 2009-07-19 15:15:54.000000000 -0700
 @@ -32,7 +32,7 @@
  static void printdigraph __ARGS((digr_T *));
@@ -2988 +3062 @@
 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-06-05 14:25:48.000000000 -0700
++++ vim72/src/edit.c    2009-07-19 15:18:33.000000000 -0700
 @@ -57,7 +57,7 @@
      N_(" Keyword Local completion (^N^P)"),
@@ -2998 +3072 @@
  /*
   * Structure used to store one match for insert completion.
-@@ -147,6 +147,7 @@
+@@ -114,6 +114,10 @@
+  * FALSE the word to be completed must be located. */
+ static int       compl_started = FALSE;
+ 
++/* Set when doing something for completion that may call edit() recursively,
++ * which is not allowed. */
++static int       compl_busy = FALSE;
++
+ static int       compl_matches = 0;
+ static char_u    *compl_pattern = NULL;
+ static int       compl_direction = FORWARD;
+@@ -147,6 +151,7 @@
  static int  ins_compl_bs __ARGS((void));
  static void ins_compl_new_leader __ARGS((void));
@@ -3006 +3091 @@
  static void ins_compl_set_original_text __ARGS((char_u *str));
  static void ins_compl_addfrommatch __ARGS((void));
-@@ -164,7 +165,7 @@
+@@ -164,7 +169,7 @@
  static int  ins_compl_key2count __ARGS((int c));
  static int  ins_compl_use_match __ARGS((int c));
@@ -3015 +3100 @@
  
  #define BACKSPACE_CHAR             1
-@@ -197,7 +198,8 @@
+@@ -197,7 +202,8 @@
  static void mb_replace_pop_ins __ARGS((int cc));
  #endif
@@ -3025 +3110 @@
  static int cindent_on __ARGS((void));
  #endif
-@@ -304,7 +306,7 @@
+@@ -304,7 +310,7 @@
      int                c = 0;
      char_u     *ptr;
@@ -3034 +3119 @@
      int                i;
      int                did_backspace = TRUE;       /* previous char was backspace */
-@@ -385,7 +387,7 @@
+@@ -344,7 +350,7 @@
+ 
+ #ifdef FEAT_INS_EXPAND
+     /* Don't allow recursive insert mode when busy with completion. */
+-    if (compl_started || pum_visible())
++    if (compl_started || compl_busy || pum_visible())
+     {
+        EMSG(_(e_secure));
+        return FALSE;
+@@ -385,7 +391,7 @@
         if (startln)
             Insstart.col = 0;
@@ -3043 +3137 @@
      if (!did_ai)
         ai_col = 0;
-@@ -651,7 +653,7 @@
+@@ -651,7 +657,7 @@
             mincol = curwin->w_wcol;
             validate_cursor_col();
@@ -3052 +3146 @@
                                                  + curwin->w_height - 1 - p_so
                     && (curwin->w_cursor.lnum != curwin->w_topline
-@@ -751,7 +753,7 @@
+@@ -751,7 +757,7 @@
                  * there is nothing to add, CTRL-L works like CTRL-P then. */
                 if (c == Ctrl_L
@@ -3061 +3155 @@
                 {
                     ins_compl_addfrommatch();
-@@ -1771,7 +1773,7 @@
+@@ -1338,8 +1344,10 @@
+                goto normalchar;
+ 
+ docomplete:
++           compl_busy = TRUE;
+            if (ins_complete(c) == FAIL)
+                compl_cont_status = 0;
++           compl_busy = FALSE;
+            break;
+ #endif /* FEAT_INS_EXPAND */
+ 
+@@ -1771,7 +1779,7 @@
          * Compute the screen column where the cursor should be.
          */
@@ -3070 +3175 @@
         /*
          * Advance the cursor until we reach the right screen column.
-@@ -1798,9 +1800,9 @@
+@@ -1798,9 +1806,9 @@
          */
         if (vcol != (int)curwin->w_virtcol)
@@ -3082 +3187 @@
             {
                 new_cursor_col += i;
-@@ -1824,7 +1826,7 @@
+@@ -1824,7 +1832,7 @@
      if (new_cursor_col <= 0)
         curwin->w_cursor.col = 0;
@@ -3091 +3196 @@
      changed_cline_bef_curs();
  
-@@ -1933,6 +1935,8 @@
+@@ -1933,6 +1941,8 @@
  /*
   * Backspace the cursor until the given column.  Handles REPLACE and VREPLACE
@@ -3100 +3205 @@
      void
  backspace_until_column(col)
-@@ -1942,13 +1946,50 @@
+@@ -1942,13 +1952,50 @@
      {
         curwin->w_cursor.col--;
@@ -3154 +3259 @@
  /*
   * CTRL-X pressed in Insert mode.
-@@ -2160,7 +2201,7 @@
+@@ -2160,7 +2207,7 @@
             actual_compl_length = compl_length;
  
@@ -3163 +3268 @@
         {
             p = str;
-@@ -2418,7 +2459,7 @@
+@@ -2418,7 +2465,7 @@
         {
             had_match = (curwin->w_cursor.col > compl_col);
@@ -3172 +3277 @@
  
             /* When the match isn't there (to avoid matching itself) remove it
-@@ -2470,7 +2511,7 @@
+@@ -2470,7 +2517,7 @@
             *p = NUL;
             had_match = (curwin->w_cursor.col > compl_col);
@@ -3181 +3286 @@
  
             /* When the match isn't there (to avoid matching itself) remove it
-@@ -2539,7 +2580,7 @@
+@@ -2539,7 +2586,7 @@
   */
      void
@@ -3190 +3295 @@
  {
      /* If already doing completions stop it. */
-@@ -2550,10 +2591,10 @@
+@@ -2550,10 +2597,10 @@
      if (stop_arrow() == FAIL)
         return;
@@ -3203 +3308 @@
      compl_orig_text = vim_strnsave(ml_get_curline() + compl_col, compl_length);
      if (compl_orig_text == NULL || ins_compl_add(compl_orig_text,
-@@ -2819,7 +2860,6 @@
+@@ -2819,7 +2866,6 @@
      regmatch_T regmatch;
      char_u     **files;
@@ -3211 +3316 @@
      int                dir = compl_direction;
  
-@@ -2851,17 +2891,18 @@
+@@ -2851,17 +2897,18 @@
      if (ctrl_x_mode == CTRL_X_WHOLE_LINE)
      {
@@ -3233 +3338 @@
         vim_free(pat_esc);
         vim_free(ptr);
-@@ -2952,7 +2993,7 @@
+@@ -2952,7 +2999,7 @@
         {
             vim_snprintf((char *)IObuff, IOSIZE,
@@ -3242 +3347 @@
  
         if (fp != NULL)
-@@ -3209,7 +3250,7 @@
+@@ -3133,6 +3180,7 @@
+        vim_free(match);
+     } while (compl_curr_match != NULL && compl_curr_match != compl_first_match);
+     compl_first_match = compl_curr_match = NULL;
++    compl_shown_match = NULL;
+ }
+ 
+     static void
+@@ -3209,7 +3257,7 @@
  {
      ins_compl_del_pum();
@@ -3251 +3364 @@
  
      if (compl_started)
-@@ -3264,6 +3305,20 @@
+@@ -3264,6 +3312,20 @@
  }
  
@@ -3272 +3385 @@
   * matches.
   */
-@@ -3292,7 +3347,7 @@
+@@ -3292,7 +3354,7 @@
  
      vim_free(compl_leader);
@@ -3281 +3394 @@
         ins_compl_new_leader();
  }
-@@ -3340,7 +3395,7 @@
+@@ -3340,7 +3402,7 @@
  ins_compl_addfrommatch()
  {
@@ -3290 +3403 @@
      compl_T    *cp;
  
-@@ -3621,10 +3676,9 @@
+@@ -3621,10 +3683,9 @@
             {
                 ins_compl_delete();
@@ -3303 +3416 @@
             }
  
-@@ -3907,7 +3961,7 @@
+@@ -3907,7 +3968,7 @@
                             : ins_buf->b_sfname == NULL
                                 ? (char *)ins_buf->b_fname
@@ -3312 +3425 @@
             else if (*e_cpt == NUL)
                 break;
-@@ -3936,8 +3990,8 @@
+@@ -3936,8 +3997,8 @@
                 else if (*e_cpt == ']' || *e_cpt == 't')
                 {
@@ -3323 +3436 @@
                 else
                     type = -1;
-@@ -4035,7 +4089,7 @@
+@@ -4035,7 +4096,7 @@
         case CTRL_X_SPELL:
  #ifdef FEAT_SPELL
@@ -3332 +3445 @@
                 ins_compl_add_matches(num_matches, matches, p_ic);
  #endif
-@@ -4187,7 +4241,7 @@
+@@ -4187,7 +4248,7 @@
         }
  
@@ -3341 +3454 @@
             found_new_match = OK;
  
-@@ -4256,7 +4310,7 @@
+@@ -4256,7 +4317,7 @@
      static void
  ins_compl_insert()
@@ -3350 +3463 @@
         compl_used_match = FALSE;
      else
-@@ -4425,7 +4479,7 @@
+@@ -4425,7 +4486,7 @@
         if (!compl_get_longest || compl_used_match)
             ins_compl_insert();
@@ -3359 +3472 @@
      else
         compl_used_match = FALSE;
-@@ -4688,7 +4742,7 @@
+@@ -4688,7 +4749,7 @@
                 }
                 compl_length = curwin->w_cursor.col - (int)compl_col;
@@ -3368 +3481 @@
                 if (compl_length > (IOSIZE - MIN_SPACE))
                 {
-@@ -4745,10 +4799,9 @@
+@@ -4745,10 +4806,9 @@
             {
                 char_u      *prefix = (char_u *)"\\<";
@@ -3381 +3494 @@
                     return FAIL;
                 if (!vim_iswordp(line + compl_col)
-@@ -4823,7 +4876,7 @@
+@@ -4823,7 +4883,7 @@
                 else
                 {
@@ -3390 +3503 @@
                         return FAIL;
                     STRCPY((char *)compl_pattern, "\\<");
-@@ -4905,7 +4958,7 @@
+@@ -4905,7 +4965,7 @@
             if (col < 0)
                 col = curs_col;
@@ -3399 +3512 @@
  
             /* Setup variables for completion.  Need to obtain "line" again,
-@@ -5178,15 +5231,15 @@
+@@ -5178,15 +5238,15 @@
   * a backslash) the metachars, and dest would be NUL terminated.
   * Returns the length (needed) of dest
@@ -3418 +3531 @@
         switch (*src)
         {
-@@ -6015,7 +6068,7 @@
+@@ -6015,7 +6075,7 @@
       * in 'formatoptions' and there is a single character before the cursor.
       * Otherwise the line would be broken and when typing another non-white
@@ -3427 +3540 @@
      {
         dec_cursor();
-@@ -6192,7 +6245,7 @@
+@@ -6192,7 +6252,7 @@
       * three digits. */
      if (VIM_ISDIGIT(c))
@@ -3436 +3549 @@
      }
      else
-@@ -6266,7 +6319,7 @@
+@@ -6266,7 +6326,7 @@
             ins_need_undo = FALSE;
         }
@@ -3445 +3558 @@
  #ifdef FEAT_VREPLACE
         if (State & VREPLACE_FLAG)
-@@ -6369,13 +6422,17 @@
+@@ -6369,13 +6429,17 @@
  
         /* If we just did an auto-indent, remove the white space from the end
@@ -3465 +3578 @@
             {
                 if (gchar_cursor() == NUL && curwin->w_cursor.col > 0)
-@@ -6383,7 +6440,8 @@
+@@ -6383,7 +6447,8 @@
                 cc = gchar_cursor();
                 if (!vim_iswhite(cc))
@@ -3475 +3588 @@
             if (curwin->w_cursor.lnum != tpos.lnum)
                 curwin->w_cursor = tpos;
-@@ -6395,10 +6453,11 @@
+@@ -6395,10 +6460,11 @@
              * deleted characters. */
             if (VIsual_active && VIsual.lnum == curwin->w_cursor.lnum)
@@ -3490 +3603 @@
                     VIsual.coladd = 0;
  # endif
-@@ -7123,9 +7182,12 @@
+@@ -7123,9 +7189,12 @@
   * cc == 0: character was inserted, delete it
   * cc > 0: character was replaced, put cc (first byte of original char) back
@@ -3504 +3617 @@
      int                cc;
  #ifdef FEAT_VREPLACE
-@@ -7153,7 +7215,7 @@
+@@ -7153,7 +7222,7 @@
  #ifdef FEAT_MBYTE
         if (has_mbyte)
@@ -3513 +3626 @@
             if (State & VREPLACE_FLAG)
                 orig_len = (int)STRLEN(ml_get_cursor());
-@@ -7203,7 +7265,7 @@
+@@ -7203,7 +7272,7 @@
         changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col);
      }
@@ -3522 +3635 @@
  
  #ifdef FEAT_CINDENT
-@@ -7646,9 +7708,7 @@
+@@ -7646,9 +7715,7 @@
       */
      ++no_mapping;
@@ -3532 +3645 @@
      {
         /* Get a third key for literal register insertion */
-@@ -7657,9 +7717,7 @@
+@@ -7657,9 +7724,7 @@
         add_to_showcmd_c(literally);
  #endif
@@ -3542 +3655 @@
      --no_mapping;
  
-@@ -8150,7 +8208,7 @@
+@@ -8150,7 +8215,7 @@
  /*
   * If the cursor is on an indent, ^T/^D insert/delete one
@@ -3551 +3664 @@
   * autoindent, we support it everywhere.
   */
-@@ -8239,7 +8297,7 @@
+@@ -8239,7 +8304,7 @@
          * Replace mode */
         if (curwin->w_cursor.lnum != Insstart.lnum
@@ -3560 +3673 @@
      else
         (void)del_char(FALSE);
-@@ -8258,6 +8316,7 @@
+@@ -8258,6 +8323,7 @@
      linenr_T   lnum;
      int                cc;
@@ -3568 +3681 @@
      int                did_backspace = FALSE;
      int                in_indent;
-@@ -8415,13 +8474,13 @@
+@@ -8415,13 +8481,13 @@
                  */
                 while (cc > 0)
@@ -3584 +3697 @@
                 }
                 /* restore the characters that NL replaced */
-@@ -8453,11 +8512,11 @@
+@@ -8453,11 +8519,11 @@
  #endif
                             )
@@ -3598 +3711 @@
  
         /*
-@@ -8556,7 +8615,7 @@
+@@ -8556,7 +8622,7 @@
                 break;
             }
@@ -3607 +3720 @@
             {
  #ifdef FEAT_MBYTE
-@@ -8931,7 +8990,10 @@
+@@ -8931,7 +8997,10 @@
         foldOpenCursor();
  #endif
@@ -3621 +3734 @@
 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-06-05 14:26:02.000000000 -0700
++++ vim72/src/eval.c    2009-07-19 15:17:12.000000000 -0700
 @@ -32,6 +32,9 @@
  
@@ -6058 +6171 @@
 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-06-05 14:25:09.000000000 -0700
++++ vim72/src/ex_cmds2.c        2009-07-19 15:16:28.000000000 -0700
 @@ -28,7 +28,8 @@
  {
@@ -6193 +6306 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/ex_cmds.c 2009-07-19 15:18:39.000000000 -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));
@@ -6513 +6626 @@
  
      --RedrawingDisabled;
-@@ -4022,8 +4034,10 @@
+@@ -3997,6 +4009,9 @@
+            break;
+        ml_delete(eap->line1, FALSE);
+     }
++
++    /* make sure the cursor is not beyond the end of the file now */
++    check_cursor_lnum();
+     deleted_lines_mark(eap->line1, (long)(eap->line2 - lnum));
+ 
+     /* ":append" on the line above the deleted lines. */
+@@ -4022,8 +4037,10 @@
         bigness = curwin->w_height;
      else if (firstwin == lastwin)
@@ -6524 +6647 @@
         bigness = 1;
  
-@@ -4472,7 +4486,7 @@
+@@ -4472,7 +4489,7 @@
             char_u      *p1;
             int         did_sub = FALSE;
@@ -6533 +6656 @@
             int         do_again;       /* do it again after joining lines */
             int         skip_match = FALSE;
-@@ -4617,6 +4631,8 @@
+@@ -4617,6 +4634,8 @@
  
                 if (do_ask)
@@ -6542 +6665 @@
                      * properly */
                     save_State = State;
-@@ -4655,7 +4671,7 @@
+@@ -4655,7 +4674,7 @@
                             resp = getexmodeline('?', NULL, 0);
                             if (resp != NULL)
@@ -6551 +6674 @@
                             }
                         }
-@@ -4707,7 +4723,7 @@
+@@ -4707,7 +4726,7 @@
  #endif
                             ++no_mapping;       /* don't map this key */
@@ -6560 +6683 @@
                             --no_mapping;
  
-@@ -4718,35 +4734,35 @@
+@@ -4718,35 +4737,35 @@
                         }
  
@@ -6604 +6727 @@
  #endif
                     }
-@@ -4757,7 +4773,7 @@
+@@ -4757,7 +4776,7 @@
                     if (vim_strchr(p_cpo, CPO_UNDO) != NULL)
                         --no_u_sync;
@@ -6613 +6736 @@
                         /* For a multi-line match, put matchcol at the NUL at
                          * the end of the line and set nmatch to one, so that
-@@ -4808,9 +4824,9 @@
+@@ -4808,9 +4827,9 @@
                     p1 = ml_get(sub_firstlnum + nmatch - 1);
                     nmatch_tl += nmatch - 1;
@@ -6626 +6749 @@
                 {
                     /*
-@@ -4833,7 +4849,7 @@
+@@ -4833,7 +4852,7 @@
                      */
                     len = (unsigned)STRLEN(new_start);
@@ -6635 +6758 @@
                         new_start_len = needed_len + 50;
                         if ((p1 = alloc_check(new_start_len)) == NULL)
-@@ -4851,8 +4867,8 @@
+@@ -4851,8 +4870,8 @@
                 /*
                  * copy the text up to the part that matched
@@ -6646 +6769 @@
                 (void)vim_regsub_multi(&regmatch,
                                     sub_firstlnum - regmatch.startpos[0].lnum,
-@@ -5059,6 +5075,7 @@
+@@ -5059,6 +5078,7 @@
  
             if (did_sub)
@@ -6654 +6777 @@
             sub_firstline = NULL;
         }
-@@ -5769,7 +5786,7 @@
+@@ -5769,7 +5789,7 @@
       * Recognize a few exceptions to the rule. Some strings that contain '*'
       * with "star".  Otherwise '*' is recognized as a wildcard.
@@ -6663 +6786 @@
         {
             STRCPY(d, rtable[i]);
-@@ -6519,22 +6536,11 @@
+@@ -6519,22 +6539,11 @@
  static sign_T  *first_sign = NULL;
  static int     last_sign_typenr = MAX_TYPENR;  /* is decremented */
@@ -6689 +6812 @@
  #define SIGNCMD_DEFINE 0
                         "undefine",
-@@ -6547,22 +6553,51 @@
+@@ -6547,22 +6556,51 @@
  #define SIGNCMD_UNPLACE        4
                         "jump",
@@ -6752 +6875 @@
      arg = skipwhite(p);
  
-@@ -6728,24 +6763,8 @@
+@@ -6728,24 +6766,8 @@
                 /* ":sign list {name}" */
                 sign_list_defined(sp);
@@ -6778 +6901 @@
      }
      else
-@@ -6994,6 +7013,31 @@
+@@ -6994,6 +7016,31 @@
  }
  
@@ -6810 +6933 @@
   * If "line" is TRUE: line highl, if FALSE: text highl.
   */
-@@ -7067,6 +7111,198 @@
+@@ -7067,6 +7114,198 @@
      return (char_u *)_("[Deleted]");
  }
@@ -7011 +7134 @@
 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-06-05 14:16:09.000000000 -0700
++++ vim72/src/ex_cmds.h 2009-07-19 15:18:31.000000000 -0700
 @@ -278,7 +278,7 @@
  EX(CMD_crewind,                "crewind",      ex_cc,
@@ -7057 +7180 @@
                         TRLBAR|EXTRA|CMDWIN|SBOXOK),
  EX(CMD_setfiletype,    "setfiletype",  ex_setfiletype,
+@@ -987,6 +991,8 @@
+                        BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+ EX(CMD_unmenu,         "unmenu",       ex_menu,
+                        BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
++EX(CMD_unsilent,       "unsilent",     ex_wrongmodifier,
++                       NEEDARG|EXTRA|NOTRLCOM|SBOXOK|CMDWIN),
+ EX(CMD_update,         "update",       ex_update,
+                        RANGE|WHOLEFOLD|BANG|FILE1|ARGOPT|DFLALL|TRLBAR),
+ EX(CMD_vglobal,                "vglobal",      ex_global,
 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-06-05 14:25:02.000000000 -0700
++++ vim72/src/ex_docmd.c        2009-07-19 15:18:41.000000000 -0700
 @@ -364,6 +364,7 @@
  # define ex_function           ex_ni
@@ -7093 +7225 @@
  {
  # ifdef FEAT_EVAL
+@@ -1678,8 +1677,8 @@
+     char_u             *errormsg = NULL;       /* error message */
+     exarg_T            ea;                     /* Ex command arguments */
+     long               verbose_save = -1;
+-    int                        save_msg_scroll = 0;
+-    int                        did_silent = 0;
++    int                        save_msg_scroll = msg_scroll;
++    int                        save_msg_silent = -1;
+     int                        did_esilent = 0;
+ #ifdef HAVE_SANDBOX
+     int                        did_sandbox = FALSE;
 @@ -1770,7 +1769,7 @@
                         }
@@ -7102 +7245 @@
  #endif
                             continue;
-@@ -2698,6 +2697,11 @@
+@@ -1857,9 +1856,9 @@
+                        }
+                        if (!checkforcmd(&ea.cmd, "silent", 3))
+                            break;
+-                       ++did_silent;
++                       if (save_msg_silent == -1)
++                           save_msg_silent = msg_silent;
+                        ++msg_silent;
+-                       save_msg_scroll = msg_scroll;
+                        if (*ea.cmd == '!' && !vim_iswhite(ea.cmd[-1]))
+                        {
+                            /* ":silent!", but not "silent !cmd" */
+@@ -1887,6 +1886,13 @@
+ #endif
+                        continue;
+ 
++           case 'u':   if (!checkforcmd(&ea.cmd, "unsilent", 3))
++                           break;
++                       if (save_msg_silent == -1)
++                           save_msg_silent = msg_silent;
++                       msg_silent = 0;
++                       continue;
++
+            case 'v':   if (checkforcmd(&ea.cmd, "vertical", 4))
+                        {
+ #ifdef FEAT_VERTSPLIT
+@@ -2685,19 +2691,23 @@
+ 
+     cmdmod = save_cmdmod;
+ 
+-    if (did_silent > 0)
++    if (save_msg_silent != -1)
+     {
+        /* messages could be enabled for a serious error, need to check if the
+         * counters don't become negative */
+-       msg_silent -= did_silent;
+-       if (msg_silent < 0)
+-           msg_silent = 0;
++       if (!did_emsg)
++           msg_silent = save_msg_silent;
+        emsg_silent -= did_esilent;
+        if (emsg_silent < 0)
+            emsg_silent = 0;
         /* Restore msg_scroll, it's set by file I/O commands, even when no
          * message is actually displayed. */
@@ -7114 +7299 @@
  
  #ifdef HAVE_SANDBOX
-@@ -2731,7 +2735,7 @@
+@@ -2731,7 +2741,7 @@
      int                i;
  
@@ -7123 +7308 @@
      if (i >= len && !isalpha((*pp)[i]))
      {
-@@ -2748,11 +2752,10 @@
+@@ -2748,11 +2758,10 @@
   * "full" is set to TRUE if the whole command name matched.
   * Returns NULL for an ambiguous user command.
@@ -7136 +7321 @@
      int                len;
      char_u     *p;
-@@ -2797,7 +2800,7 @@
+@@ -2797,7 +2806,7 @@
             /* Check for ":dl", ":dell", etc. to ":deletel": that's
              * :delete with the 'l' flag.  Same for 'p'. */
@@ -7145 +7330 @@
             if (i == len - 1)
             {
-@@ -2978,6 +2981,7 @@
+@@ -2978,11 +2987,13 @@
      {"keepmarks", 3, FALSE},
      {"leftabove", 5, FALSE},
@@ -7153 +7338 @@
      {"sandbox", 3, FALSE},
      {"silent", 3, FALSE},
-@@ -3000,7 +3004,7 @@
+     {"tab", 3, TRUE},
+     {"topleft", 2, FALSE},
++    {"unsilent", 3, FALSE},
+     {"verbose", 4, TRUE},
+     {"vertical", 4, FALSE},
+ };
+@@ -3000,7 +3011,7 @@
  
      if (VIM_ISDIGIT(*cmd))
@@ -7162 +7353 @@
         for (j = 0; p[j] != NUL; ++j)
             if (p[j] != cmdmods[i].name[j])
-@@ -3028,7 +3032,7 @@
+@@ -3028,7 +3039,7 @@
      char_u     *p;
  
@@ -7171 +7362 @@
         for (j = 0; name[j] != NUL; ++j)
             if (name[j] != cmdmods[i].name[j])
-@@ -3608,6 +3612,7 @@
+@@ -3608,6 +3619,7 @@
             return set_context_in_autocmd(xp, arg, FALSE);
  
@@ -7179 +7370 @@
  #endif
         case CMD_set:
-@@ -3680,6 +3685,18 @@
+@@ -3680,6 +3692,18 @@
         case CMD_highlight:
             set_context_in_highlight_cmd(xp, arg);
@@ -7198 +7389 @@
         case CMD_bdelete:
         case CMD_bwipeout:
-@@ -3803,7 +3820,7 @@
+@@ -3803,7 +3827,7 @@
      char_u     *cmd;
      int                *ctx;   /* pointer to xp_context or NULL */
@@ -7207 +7398 @@
      while (vim_strchr((char_u *)" \t0123456789.$%'/?-+,;", *cmd) != NULL)
      {
-@@ -5033,10 +5050,9 @@
+@@ -5033,10 +5057,9 @@
  /*
   * Function given to ExpandGeneric() to obtain the list of command names.
@@ -7219 +7410 @@
  {
      if (idx >= (int)CMD_SIZE)
-@@ -5121,7 +5137,11 @@
+@@ -5121,7 +5144,11 @@
             }
  
@@ -7232 +7423 @@
         }
  
-@@ -5180,6 +5200,9 @@
+@@ -5180,6 +5207,9 @@
      {EXPAND_AUGROUP, "augroup"},
      {EXPAND_BUFFERS, "buffer"},
@@ -7242 +7433 @@
      {EXPAND_USER_DEFINED, "custom"},
      {EXPAND_USER_LIST, "customlist"},
-@@ -5196,6 +5219,9 @@
+@@ -5196,6 +5226,9 @@
      {EXPAND_MENUS, "menu"},
      {EXPAND_SETTINGS, "option"},
@@ -7252 +7443 @@
      {EXPAND_TAGS_LISTFILES, "tag_listfiles"},
      {EXPAND_USER_VARS, "var"},
-@@ -5479,6 +5505,9 @@
+@@ -5479,6 +5512,9 @@
      return OK;
  }
@@ -7262 +7453 @@
  ex_command(eap)
      exarg_T   *eap;
-@@ -5540,10 +5569,9 @@
+@@ -5540,10 +5576,9 @@
   * ":comclear"
   * Clear all user commands, global and for current buffer.
@@ -7274 +7465 @@
      uc_clear(&ucmds);
      uc_clear(&curbuf->b_ucmds);
-@@ -5910,7 +5938,8 @@
+@@ -5910,7 +5945,8 @@
      char_u     *q;
  
@@ -7284 +7475 @@
  
      size_t     split_len = 0;
-@@ -5927,16 +5956,51 @@
+@@ -5927,16 +5963,51 @@
  
      /*
@@ -7340 +7531 @@
             ++end;
  
-@@ -6003,10 +6067,9 @@
+@@ -6003,10 +6074,9 @@
  /*
   * Function given to ExpandGeneric() to obtain the list of user command names.
@@ -7352 +7543 @@
  {
      if (idx < curbuf->b_ucmds.ga_len)
-@@ -6021,17 +6084,16 @@
+@@ -6021,17 +6091,16 @@
   * Function given to ExpandGeneric() to obtain the list of user command
   * attributes.
@@ -7372 +7563 @@
      return (char_u *)user_cmd_flags[idx];
  }
-@@ -6039,15 +6101,14 @@
+@@ -6039,15 +6108,14 @@
  /*
   * Function given to ExpandGeneric() to obtain the list of values for -nargs.
@@ -7390 +7581 @@
      return (char_u *)user_cmd_nargs[idx];
  }
-@@ -6055,10 +6116,9 @@
+@@ -6055,10 +6123,9 @@
  /*
   * Function given to ExpandGeneric() to obtain the list of values for -complete.
@@ -7402 +7593 @@
  {
      return (char_u *)command_complete[idx].name;
-@@ -6236,10 +6296,9 @@
+@@ -6236,10 +6303,9 @@
  /*
   * ":cquit".
@@ -7414 +7605 @@
      getout(1); /* this does not always pass on the exit code to the Manx
                    compiler. why? */
-@@ -6681,10 +6740,9 @@
+@@ -6681,10 +6747,9 @@
  /*
   * ":shell".
@@ -7426 +7617 @@
      do_shell(NULL, 0);
  }
-@@ -6988,10 +7046,9 @@
+@@ -6988,10 +7053,9 @@
  /*
   * ":preserve".
@@ -7438 +7629 @@
      curbuf->b_flags |= BF_PRESERVED;
      ml_preserve(curbuf, TRUE);
-@@ -7223,10 +7280,9 @@
+@@ -7223,10 +7287,9 @@
  /*
   * :tabs command: List tabs and their contents.
@@ -7450 +7641 @@
      tabpage_T  *tp;
      win_T      *wp;
-@@ -7413,7 +7469,6 @@
+@@ -7413,7 +7476,6 @@
  /*
   * ":edit <file>" command and alikes.
@@ -7458 +7649 @@
  do_exedit(eap, old_curwin)
      exarg_T    *eap;
-@@ -7624,10 +7679,9 @@
+@@ -7624,10 +7686,9 @@
  }
  #endif
@@ -7470 +7661 @@
      if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL)
         MSG(_("No swap file"));
-@@ -7640,10 +7694,9 @@
+@@ -7640,10 +7701,9 @@
   * offset.
   * (1998-11-02 16:21:01  R. Edward Ralston <eralston@computer.org>)
@@ -7482 +7673 @@
  #ifdef FEAT_SCROLLBIND
      win_T      *wp;
-@@ -7803,6 +7856,9 @@
+@@ -7784,10 +7844,10 @@
+                if (*ml_get(lnum) == NUL && u_savedel(lnum, 1L) == OK)
+                {
+                    ml_delete(lnum, FALSE);
+-                   deleted_lines_mark(lnum, 1L);
+                    if (curwin->w_cursor.lnum > 1
+                                             && curwin->w_cursor.lnum >= lnum)
+                        --curwin->w_cursor.lnum;
++                   deleted_lines_mark(lnum, 1L);
+                }
+            }
+            redraw_curbuf_later(VALID);
+@@ -7803,6 +7863,9 @@
  {
      vim_free(prev_dir);
@@ -7492 +7695 @@
  #endif
  
-@@ -7825,6 +7881,10 @@
+@@ -7825,6 +7888,10 @@
      else
  #endif
@@ -7503 +7706 @@
                                                              && !eap->forceit)
         {
-@@ -7906,10 +7966,9 @@
+@@ -7896,7 +7963,7 @@
+            shorten_fnames(TRUE);
+ 
+            /* Echo the new current directory if the command was typed. */
+-           if (KeyTyped)
++           if (KeyTyped || p_verbose >= 5)
+                ex_pwd(eap);
+        }
+        vim_free(tofree);
+@@ -7906,10 +7973,9 @@
  /*
   * ":pwd".
@@ -7515 +7727 @@
      if (mch_dirname(NameBuff, MAXPATHL) == OK)
      {
-@@ -8340,10 +8399,9 @@
+@@ -8340,10 +8406,9 @@
  /*
   * ":undo".
@@ -7527 +7739 @@
      if (eap->addr_count == 1)      /* :undo 123 */
         undo_time(eap->line2, FALSE, TRUE);
-@@ -8354,10 +8412,9 @@
+@@ -8354,10 +8419,9 @@
  /*
   * ":redo".
@@ -7539 +7751 @@
      u_redo(1);
  }
-@@ -8365,7 +8422,6 @@
+@@ -8365,7 +8429,6 @@
  /*
   * ":earlier" and ":later".
@@ -7547 +7759 @@
  ex_later(eap)
      exarg_T    *eap;
-@@ -8550,10 +8606,9 @@
+@@ -8550,10 +8613,9 @@
  /*
   * ":redrawstatus": force redraw of status line(s)
@@ -7559 +7771 @@
  #if defined(FEAT_WINDOWS)
      int                r = RedrawingDisabled;
-@@ -8749,8 +8804,8 @@
+@@ -8630,6 +8692,8 @@
+     }
+ 
+ #ifdef FEAT_SESSION
++    /* Use the short file name until ":lcd" is used.  We also don't use the
++     * short file name when 'acd' is set, that is checked later. */
+     did_lcd = FALSE;
+ 
+     /* ":mkview" or ":mkview 9": generate file name with 'viewdir' */
+@@ -8749,8 +8813,8 @@
                 else if (*dirnow != NUL
                         && (ssop_flags & SSOP_CURDIR) && globaldir != NULL)
@@ -7570 +7791 @@
  
                 failed |= (makeopens(fd, dirnow) == FAIL);
-@@ -8814,11 +8869,10 @@
+@@ -8814,11 +8878,10 @@
  
  #if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \
@@ -7583 +7804 @@
      if (vim_mkdir(name, prot) != 0)
      {
-@@ -9089,10 +9143,9 @@
+@@ -9089,10 +9152,9 @@
  /*
   * ":stopinsert"
@@ -7595 +7816 @@
      restart_edit = 0;
      stop_insert_mode = TRUE;
-@@ -9366,9 +9419,8 @@
+@@ -9366,9 +9428,8 @@
  # define SPEC_CLIENT 9
  #endif
@@ -7606 +7827 @@
         len = (int)STRLEN(spec_str[i]);
         if (STRNCMP(src, spec_str[i], len) == 0)
-@@ -9506,24 +9558,50 @@
+@@ -9506,24 +9567,50 @@
                     break;
                 }
@@ -7667 +7888 @@
  
  #ifdef FEAT_SEARCHPATH
-@@ -9541,6 +9619,15 @@
+@@ -9541,6 +9628,15 @@
  #ifdef FEAT_AUTOCMD
         case SPEC_AFILE:        /* file name for autocommand */
@@ -7683 +7904 @@
                 {
                     *errormsg = (char_u *)_("E495: no autocommand file name to substitute for \"<afile>\"");
-@@ -9684,7 +9771,7 @@
+@@ -9684,7 +9780,7 @@
         }
  
@@ -7692 +7913 @@
             break;
      }
-@@ -10067,7 +10154,7 @@
+@@ -10067,7 +10163,7 @@
       */
      if (put_line(fd, "let s:sx = expand(\"<sfile>:p:r\").\"x.vim\"") == FAIL
@@ -7701 +7922 @@
         return FAIL;
  
-@@ -10689,7 +10776,8 @@
+@@ -10485,6 +10581,9 @@
+     if (buf->b_sfname != NULL
+            && flagp == &ssop_flags
+            && (ssop_flags & (SSOP_CURDIR | SSOP_SESDIR))
++#ifdef FEAT_AUTOCHDIR
++           && !p_acd
++#endif
+            && !did_lcd)
+        name = buf->b_sfname;
+     else
+@@ -10689,7 +10788,8 @@
         p_viminfo = (char_u *)"'100";
      if (eap->cmdidx == CMD_rviminfo)
@@ -7711 +7942 @@
      }
      else
-@@ -10850,10 +10938,9 @@
+@@ -10850,10 +10950,9 @@
  }
  #endif
@@ -7723 +7954 @@
  #ifdef FEAT_DIGRAPHS
      if (*eap->arg != NUL)
-@@ -10887,10 +10974,9 @@
+@@ -10887,10 +10986,9 @@
  /*
   * ":nohlsearch"
@@ -7735 +7966 @@
      no_hlsearch = TRUE;
      redraw_all_later(SOME_VALID);
-@@ -10969,10 +11055,9 @@
+@@ -10969,10 +11067,9 @@
  /*
   * ":X": Get crypt key
@@ -7749 +7980 @@
 diff -Naur vim72.orig/src/ex_eval.c vim72/src/ex_eval.c
 --- vim72.orig/src/ex_eval.c    2007-11-24 07:34:09.000000000 -0800
-+++ vim72/src/ex_eval.c 2009-06-05 14:25:02.000000000 -0700
++++ vim72/src/ex_eval.c 2009-07-19 15:16:23.000000000 -0700
 @@ -60,7 +60,9 @@
  #else
@@ -7795 +8026 @@
 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-06-05 14:25:02.000000000 -0700
++++ vim72/src/ex_getln.c        2009-07-19 15:18:07.000000000 -0700
 @@ -31,6 +31,8 @@
      int                cmdattr;        /* attributes for prompt */
@@ -8011 +8242 @@
             {
                 if (tab[i].ic)
+@@ -4831,14 +4874,14 @@
+     /* Loop over the items in the list. */
+     for (li = retlist->lv_first; li != NULL; li = li->li_next)
+     {
+-       if (li->li_tv.v_type != VAR_STRING)
+-           continue;  /* Skip non-string items */
++       if (li->li_tv.v_type != VAR_STRING || li->li_tv.vval.v_string == NULL)
++           continue;  /* Skip non-string items and empty strings */
+ 
+        if (ga_grow(&ga, 1) == FAIL)
+            break;
+ 
+        ((char_u **)ga.ga_data)[ga.ga_len] =
+-           vim_strsave(li->li_tv.vval.v_string);
++                                        vim_strsave(li->li_tv.vval.v_string);
+        ++ga.ga_len;
+     }
+     list_unref(retlist);
 @@ -4871,7 +4914,7 @@
      if (s == NULL)
@@ -8087 +8336 @@
 diff -Naur vim72.orig/src/farsi.c vim72/src/farsi.c
 --- vim72.orig/src/farsi.c      2007-12-31 08:28:10.000000000 -0800
-+++ vim72/src/farsi.c   2009-06-05 14:25:02.000000000 -0700
++++ vim72/src/farsi.c   2009-07-19 15:16:23.000000000 -0700
 @@ -103,7 +103,8 @@
         case F_HE:
@@ -8140 +8389 @@
 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-06-05 14:16:09.000000000 -0700
++++ vim72/src/feature.h 2009-07-19 15:09:53.000000000 -0700
 @@ -767,9 +767,13 @@
  
@@ -8159 +8408 @@
 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-06-05 14:25:02.000000000 -0700
++++ vim72/src/fileio.c  2009-07-19 15:18:23.000000000 -0700
 @@ -69,7 +69,7 @@
  static int au_find_group __ARGS((char_u *name));
@@ -8222 +8471 @@
                         filemess(curbuf, sfname, (char_u *)_("[New File]"), 0);
                     else
-@@ -668,6 +697,17 @@
+@@ -668,9 +697,21 @@
  #endif
      {
@@ -8239 +8488 @@
  #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 @@
+-       if (swap_mode > 0 && curbuf->b_ml.ml_mfp->mf_fname != NULL)
++       if (swap_mode > 0 && curbuf->b_ml.ml_mfp != NULL
++                         && curbuf->b_ml.ml_mfp->mf_fname != NULL)
+            (void)mch_setperm(curbuf->b_ml.ml_mfp->mf_fname, (long)swap_mode);
+ #endif
+     }
+@@ -698,7 +739,6 @@
      {
         int     m = msg_scroll;
@@ -8248 +8502 @@
         /*
          * The file must be closed again, the autocommands may want to change
-@@ -740,8 +779,13 @@
+@@ -740,8 +780,13 @@
         /*
          * Don't allow the autocommands to change the current buffer.
@@ -8262 +8516 @@
         {
             --no_wait_return;
-@@ -932,7 +976,10 @@
+@@ -932,7 +977,10 @@
      else
      {
@@ -8273 +8527 @@
             fileformat = EOL_UNIX;              /* binary: use Unix format */
         else if (*p_ffs == NUL)
-@@ -2211,7 +2258,7 @@
+@@ -2211,7 +2259,7 @@
      {
         /* Use stderr for stdin, makes shell commands work. */
@@ -8282 +8536 @@
  #endif
  
-@@ -2341,11 +2388,6 @@
+@@ -2341,11 +2389,6 @@
                 STRCAT(IObuff, _("[CR missing]"));
                 c = TRUE;
@@ -8294 +8548 @@
             {
                 STRCAT(IObuff, _("[long lines split]"));
-@@ -2711,7 +2753,7 @@
+@@ -2711,7 +2754,7 @@
  {
      if (!curbuf->b_marks_read && get_viminfo_parameter('\'') > 0
@@ -8303 +8557 @@
      /* Always set b_marks_read; needed when 'viminfo' is changed to include
       * the ' parameter after opening a buffer. */
-@@ -3451,12 +3493,12 @@
+@@ -3451,12 +3494,12 @@
                 {
  # ifdef UNIX
@@ -8318 +8572 @@
  # endif
                     /* Close the file before removing it, on MS-Windows we
-@@ -4367,14 +4409,14 @@
+@@ -4367,14 +4410,14 @@
                 || st.st_uid != st_old.st_uid
                 || st.st_gid != st_old.st_gid)
@@ -8335 +8589 @@
         buf_setino(buf);
  #endif
-@@ -5246,13 +5288,16 @@
+@@ -4782,6 +4825,8 @@
+     char_u     *sfname;
+ {
+ #ifdef FEAT_AUTOCMD
++    buf_T      *buf = curbuf;
++
+     /* It's like the unnamed buffer is deleted.... */
+     if (curbuf->b_p_bl)
+        apply_autocmds(EVENT_BUFDELETE, NULL, NULL, FALSE, curbuf);
+@@ -4790,6 +4835,12 @@
+     if (aborting())        /* autocmds may abort script processing */
+        return FAIL;
+ # endif
++    if (curbuf != buf)
++    {
++       /* We are in another buffer now, don't do the renaming. */
++       EMSG(_(e_auchangedbuf));
++       return FAIL;
++    }
+ #endif
+ 
+     if (setfname(curbuf, fname, sfname, FALSE) == OK)
+@@ -5246,13 +5297,16 @@
             /* Convert with iconv(). */
             if (ip->bw_restlen > 0)
@@ -8355 +8631 @@
             }
             else
-@@ -5550,9 +5595,10 @@
+@@ -5550,9 +5604,10 @@
             name = "ucs-4le";   /* FF FE 00 00 */
             len = 4;
@@ -8368 +8644 @@
      }
      else if (p[0] == 0xfe && p[1] == 0xff
-@@ -5917,7 +5963,7 @@
+@@ -5917,7 +5972,7 @@
         else if (*ext == '.')
  #endif
@@ -8377 +8653 @@
                 s = ptr + 8;
                 *s = '\0';
-@@ -6031,9 +6077,9 @@
+@@ -6031,9 +6086,9 @@
         {
             tbuf[FGETS_SIZE - 2] = NUL;
@@ -8389 +8665 @@
         } while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n');
      }
-@@ -6107,12 +6153,24 @@
+@@ -6107,12 +6162,24 @@
  #ifdef HAVE_ACL
      vim_acl_T  acl;            /* ACL from original file */
@@ -8416 +8692 @@
      /*
       * Fail if the "from" file doesn't exist.  Avoids that "to" is deleted.
-@@ -6120,6 +6178,55 @@
+@@ -6120,6 +6187,55 @@
      if (mch_stat((char *)from, &st) < 0)
         return -1;
@@ -8472 +8748 @@
       * 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
-@@ -6260,7 +6367,7 @@
+@@ -6260,7 +6376,7 @@
  
      if (!stuff_empty() || global_busy || !typebuf_typed()
@@ -8481 +8757 @@
                                         )
         need_check_timestamps = TRUE;           /* check later */
-@@ -6353,11 +6460,10 @@
+@@ -6353,11 +6469,10 @@
   * return 2 if a message has been displayed.
   * return 0 otherwise.
@@ -8494 +8770 @@
      struct stat        st;
      int                stat_res;
-@@ -6462,8 +6568,10 @@
+@@ -6462,8 +6577,10 @@
             set_vim_var_string(VV_FCS_REASON, (char_u *)reason, -1);
             set_vim_var_string(VV_FCS_CHOICE, (char_u *)"", -1);
@@ -8505 +8781 @@
             if (n)
             {
-@@ -6538,6 +6646,11 @@
+@@ -6511,7 +6628,10 @@
+                        mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started");
+                        mesg2 = _("See \":help W16\" for more info.");
+                    }
+-                   /* Else: only timestamp changed, ignored */
++                   else
++                       /* Only timestamp changed, store it to avoid a warning
++                        * in check_mtime() later. */
++                       buf->b_mtime_read = buf->b_mtime;
+                }
+            }
+        }
+@@ -6538,6 +6658,11 @@
             tbuf = alloc((unsigned)(STRLEN(path) + STRLEN(mesg)
                                                         + STRLEN(mesg2) + 2));
@@ -8517 +8805 @@
             if (can_reload)
             {
-@@ -6732,10 +6845,11 @@
+@@ -6732,10 +6857,11 @@
  #endif
  #ifdef FEAT_FOLDING
@@ -8531 +8819 @@
                         && !foldmethodIsManual(wp))
                     foldUpdateAll(wp);
-@@ -6753,12 +6867,11 @@
+@@ -6753,12 +6879,11 @@
      /* Careful: autocommands may have made "buf" invalid! */
  }
@@ -8545 +8833 @@
      buf->b_mtime = (long)st->st_mtime;
      buf->b_orig_size = (size_t)st->st_size;
-@@ -6821,10 +6934,9 @@
+@@ -6821,10 +6946,9 @@
   * The returned pointer is to allocated memory.
   * The returned pointer is NULL if no valid name was found.
@@ -8557 +8845 @@
  #ifdef USE_TMPNAM
      char_u     itmp[L_tmpnam]; /* use tmpnam() */
-@@ -6853,7 +6965,7 @@
+@@ -6853,7 +6977,7 @@
         /*
          * Try the entries in TEMPDIRNAMES to create the temp directory.
@@ -8566 +8854 @@
             /* expand $TMP, leave room for "/v1100000/999999999" */
             expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20);
-@@ -8523,6 +8635,7 @@
+@@ -8245,7 +8369,7 @@
+ 
+            /* Execute the modeline settings, but don't set window-local
+             * options if we are using the current window for another buffer. */
+-           do_modelines(aco.save_curwin == NULL ? OPT_NOWIN : 0);
++           do_modelines(curwin == aucmd_win ? OPT_NOWIN : 0);
+ 
+            /* restore the current window */
+            aucmd_restbuf(&aco);
+@@ -8261,8 +8385,8 @@
+ 
+ /*
+  * Prepare for executing autocommands for (hidden) buffer "buf".
+- * Search a window for the current buffer.  Save the cursor position and
+- * screen offset.
++ * Search for a visible window containing the current buffer.  If there isn't
++ * one then use "aucmd_win".
+  * Set "curbuf" and "curwin" to match "buf".
+  * When FEAT_AUTOCMD is not defined another version is used, see below.
+  */
+@@ -8272,8 +8396,9 @@
+     buf_T      *buf;           /* new curbuf */
+ {
+     win_T      *win;
+-
+-    aco->new_curbuf = buf;
++#ifdef FEAT_WINDOWS
++    int                save_ea;
++#endif
+ 
+     /* Find a window that is for the new buffer */
+     if (buf == curbuf)         /* be quick when buf is curbuf */
+@@ -8287,42 +8412,51 @@
+        win = NULL;
+ #endif
+ 
+-    /*
+-     * Prefer to use an existing window for the buffer, it has the least side
+-     * effects (esp. if "buf" is curbuf).
+-     * Otherwise, use curwin for "buf".  It might make some items in the
+-     * window invalid.  At least save the cursor and topline.
+-     */
++    /* Allocate "aucmd_win" when needed.  If this fails (out of memory) fall
++     * back to using the current window. */
++    if (win == NULL && aucmd_win == NULL)
++    {
++       win_alloc_aucmd_win();
++       if (aucmd_win == NULL)
++           win = curwin;
++    }
++
++    aco->save_curwin = curwin;
++    aco->save_curbuf = curbuf;
+     if (win != NULL)
+     {
+-       /* there is a window for "buf", make it the curwin */
+-       aco->save_curwin = curwin;
++       /* There is a window for "buf" in the current tab page, make it the
++        * curwin.  This is preferred, it has the least side effects (esp. if
++        * "buf" is curbuf). */
+        curwin = win;
+-       aco->save_buf = win->w_buffer;
+-       aco->new_curwin = win;
+     }
+     else
+     {
+-       /* there is no window for "buf", use curwin */
+-       aco->save_curwin = NULL;
+-       aco->save_buf = curbuf;
+-       --curbuf->b_nwindows;
+-       curwin->w_buffer = buf;
++       /* There is no window for "buf", use "aucmd_win".  To minimize the side
++        * effects, insert it in a the current tab page.
++        * Anything related to a window (e.g., setting folds) may have
++        * unexpected results. */
++       aucmd_win->w_buffer = buf;
+        ++buf->b_nwindows;
++       win_init_empty(aucmd_win); /* set cursor and topline to safe values */
+ 
+-       /* save cursor and topline, set them to safe values */
+-       aco->save_cursor = curwin->w_cursor;
+-       curwin->w_cursor.lnum = 1;
+-       curwin->w_cursor.col = 0;
+-       aco->save_topline = curwin->w_topline;
+-       curwin->w_topline = 1;
+-#ifdef FEAT_DIFF
+-       aco->save_topfill = curwin->w_topfill;
+-       curwin->w_topfill = 0;
++#ifdef FEAT_WINDOWS
++       /* Split the current window, put the aucmd_win in the upper half.
++        * We don't want the BufEnter or WinEnter autocommands. */
++       block_autocmds();
++       make_snapshot(SNAP_AUCMD_IDX);
++       save_ea = p_ea;
++       p_ea = FALSE;
++       (void)win_split_ins(0, WSP_TOP, aucmd_win, 0);
++       (void)win_comp_pos();   /* recompute window positions */
++       p_ea = save_ea;
++       unblock_autocmds();
+ #endif
++       curwin = aucmd_win;
+     }
+-
+     curbuf = buf;
++    aco->new_curwin = curwin;
++    aco->new_curbuf = curbuf;
+ }
+ 
+ /*
+@@ -8334,21 +8468,88 @@
+ aucmd_restbuf(aco)
+     aco_save_T *aco;           /* structure holding saved values */
+ {
+-    if (aco->save_curwin != NULL)
++#ifdef FEAT_WINDOWS
++    int dummy;
++#endif
++
++    if (aco->new_curwin == aucmd_win)
++    {
++       --curbuf->b_nwindows;
++#ifdef FEAT_WINDOWS
++       /* Find "aucmd_win", it can't be closed, but it may be in another tab
++        * page. Do not trigger autocommands here. */
++       block_autocmds();
++       if (curwin != aucmd_win)
++       {
++           tabpage_T   *tp;
++           win_T       *wp;
++
++           FOR_ALL_TAB_WINDOWS(tp, wp)
++           {
++               if (wp == aucmd_win)
++               {
++                   if (tp != curtab)
++                       goto_tabpage_tp(tp);
++                   win_goto(aucmd_win);
++                   break;
++               }
++           }
++       }
++
++       /* Remove the window and frame from the tree of frames. */
++       (void)winframe_remove(curwin, &dummy, NULL);
++       win_remove(curwin, NULL);
++       last_status(FALSE);         /* may need to remove last status line */
++       restore_snapshot(SNAP_AUCMD_IDX, FALSE);
++       (void)win_comp_pos();   /* recompute window positions */
++       unblock_autocmds();
++
++       if (win_valid(aco->save_curwin))
++           curwin = aco->save_curwin;
++       else
++           /* Hmm, original window disappeared.  Just use the first one. */
++           curwin = firstwin;
++# ifdef FEAT_EVAL
++       vars_clear(&aucmd_win->w_vars.dv_hashtab);  /* free all w: variables */
++# endif
++#else
++       curwin = aco->save_curwin;
++#endif
++       curbuf = curwin->w_buffer;
++
++       /* the buffer contents may have changed */
++       check_cursor();
++       if (curwin->w_topline > curbuf->b_ml.ml_line_count)
++       {
++           curwin->w_topline = curbuf->b_ml.ml_line_count;
++#ifdef FEAT_DIFF
++           curwin->w_topfill = 0;
++#endif
++       }
++#if defined(FEAT_GUI)
++       /* Hide the scrollbars from the aucmd_win and update. */
++       gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_LEFT], FALSE);
++       gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_RIGHT], FALSE);
++       gui_may_update_scrollbars();
++#endif
++    }
++    else
+     {
+        /* restore curwin */
+ #ifdef FEAT_WINDOWS
+        if (win_valid(aco->save_curwin))
+ #endif
+        {
+-           /* restore the buffer which was previously edited by curwin, if
+-            * it's still the same window and it's valid */
++           /* Restore the buffer which was previously edited by curwin, if
++            * it was chagned, we are still the same window and the buffer is
++            * valid. */
+            if (curwin == aco->new_curwin
+-                   && buf_valid(aco->save_buf)
+-                   && aco->save_buf->b_ml.ml_mfp != NULL)
++                   && curbuf != aco->new_curbuf
++                   && buf_valid(aco->new_curbuf)
++                   && aco->new_curbuf->b_ml.ml_mfp != NULL)
+            {
+                --curbuf->b_nwindows;
+-               curbuf = aco->save_buf;
++               curbuf = aco->new_curbuf;
+                curwin->w_buffer = curbuf;
+                ++curbuf->b_nwindows;
+            }
+@@ -8357,34 +8558,6 @@
+            curbuf = curwin->w_buffer;
+        }
+     }
+-    else
+-    {
+-       /* restore buffer for curwin if it still exists and is loaded */
+-       if (buf_valid(aco->save_buf) && aco->save_buf->b_ml.ml_mfp != NULL)
+-       {
+-           --curbuf->b_nwindows;
+-           curbuf = aco->save_buf;
+-           curwin->w_buffer = curbuf;
+-           ++curbuf->b_nwindows;
+-           curwin->w_cursor = aco->save_cursor;
+-           check_cursor();
+-           /* check topline < line_count, in case lines got deleted */
+-           if (aco->save_topline <= curbuf->b_ml.ml_line_count)
+-           {
+-               curwin->w_topline = aco->save_topline;
+-#ifdef FEAT_DIFF
+-               curwin->w_topfill = aco->save_topfill;
+-#endif
+-           }
+-           else
+-           {
+-               curwin->w_topline = curbuf->b_ml.ml_line_count;
+-#ifdef FEAT_DIFF
+-               curwin->w_topfill = 0;
+-#endif
+-           }
+-       }
+-    }
+ }
+ 
+ static int     autocmd_nested = FALSE;
+@@ -8523,6 +8696,7 @@
      char_u     *save_sourcing_name;
      linenr_T   save_sourcing_lnum;
@@ -8574 +9101 @@
      char_u     *save_autocmd_match;
      int                save_autocmd_busy;
-@@ -8601,6 +8714,7 @@
+@@ -8601,6 +8775,7 @@
       * Save the autocmd_* variables and info about the current buffer.
       */
@@ -8582 +9109 @@
      save_autocmd_match = autocmd_match;
      save_autocmd_busy = autocmd_busy;
-@@ -8618,14 +8732,15 @@
+@@ -8618,14 +8793,15 @@
         if (fname != NULL && *fname != NUL)
             autocmd_fname = fname;
@@ -8600 +9127 @@
      /*
       * Set the buffer number to be used for <abuf>.
-@@ -8667,9 +8782,11 @@
+@@ -8667,9 +8843,11 @@
      else
      {
@@ -8613 +9140 @@
                 || event == EVENT_SPELLFILEMISSING
                 || event == EVENT_QUICKFIXCMDPRE
-@@ -8810,6 +8927,7 @@
+@@ -8810,6 +8988,7 @@
      sourcing_lnum = save_sourcing_lnum;
      vim_free(autocmd_fname);
@@ -8621 +9148 @@
      autocmd_match = save_autocmd_match;
  #ifdef FEAT_EVAL
-@@ -8918,7 +9036,7 @@
+@@ -8918,7 +9097,7 @@
      {
         apc->curpat = NULL;
@@ -8630 +9157 @@
          * buffer number. */
         if (ap->pat != NULL && ap->cmds != NULL
-@@ -8967,12 +9085,11 @@
+@@ -8967,12 +9146,11 @@
   * Called by do_cmdline() to get the next line for ":if".
   * Returns allocated string, or NULL for end of autocommands.
@@ -8645 +9172 @@
      AutoPatCmd     *acp = (AutoPatCmd *)cookie;
      char_u         *retval;
-@@ -9083,10 +9200,9 @@
+@@ -9083,10 +9261,9 @@
   * Function given to ExpandGeneric() to obtain the list of autocommand group
   * names.
@@ -8657 +9184 @@
  {
      if (idx == augroups.ga_len)                /* add "END" add the end */
-@@ -9104,7 +9220,7 @@
+@@ -9104,7 +9281,7 @@
  set_context_in_autocmd(xp, arg, doautocmd)
      expand_T   *xp;
@@ -8666 +9193 @@
      char_u     *p;
      int                group;
-@@ -9152,10 +9268,9 @@
+@@ -9152,10 +9329,9 @@
  /*
   * Function given to ExpandGeneric() to obtain the list of event names.
@@ -8678 +9205 @@
  {
      if (idx < augroups.ga_len)         /* First list group names, if wanted */
-@@ -9467,13 +9582,12 @@
+@@ -9296,9 +9472,11 @@
+     aco_save_T *aco;           /* structure to save values in */
+     buf_T      *buf;           /* new curbuf */
+ {
+-    aco->save_buf = curbuf;
++    aco->save_curbuf = curbuf;
++    --curbuf->b_nwindows;
+     curbuf = buf;
+     curwin->w_buffer = buf;
++    ++curbuf->b_nwindows;
+ }
+ 
+ /*
+@@ -9309,8 +9487,10 @@
+ aucmd_restbuf(aco)
+     aco_save_T *aco;           /* structure holding saved values */
+ {
+-    curbuf = aco->save_buf;
++    --curbuf->b_nwindows;
++    curbuf = aco->save_curbuf;
+     curwin->w_buffer = curbuf;
++    ++curbuf->b_nwindows;
+ }
+ 
+ #endif /* FEAT_AUTOCMD */
+@@ -9467,13 +9647,12 @@
   *
   * Returns NULL when out of memory.
@@ -8695 +9247 @@
 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-06-05 14:19:21.000000000 -0700
++++ vim72/src/fold.c    2009-07-19 15:11:59.000000000 -0700
 @@ -48,7 +48,7 @@
  static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));
@@ -8784 +9336 @@
 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-06-05 14:22:17.000000000 -0700
-@@ -3816,7 +3816,11 @@
++++ vim72/src/getchar.c 2009-07-19 15:18:49.000000000 -0700
+@@ -1309,6 +1309,9 @@
+     return OK;
+ }
+ 
++static int old_char = -1;      /* character put back by vungetc() */
++static int old_mod_mask;       /* mod_mask for ungotten character */
++
+ #if defined(FEAT_EVAL) || defined(FEAT_EX_EXTRA) || defined(PROTO)
+ 
+ /*
+@@ -1323,6 +1326,10 @@
+     if (!tp->typebuf_valid)
+        typebuf = tp->save_typebuf;
+ 
++    tp->old_char = old_char;
++    tp->old_mod_mask = old_mod_mask;
++    old_char = -1;
++
+     tp->save_stuffbuff = stuffbuff;
+     stuffbuff.bh_first.b_next = NULL;
+ # ifdef USE_INPUT_BUF
+@@ -1344,6 +1351,9 @@
+        typebuf = tp->save_typebuf;
+     }
+ 
++    old_char = tp->old_char;
++    old_mod_mask = tp->old_mod_mask;
++
+     free_buff(&stuffbuff);
+     stuffbuff = tp->save_stuffbuff;
+ # ifdef USE_INPUT_BUF
+@@ -1499,9 +1509,6 @@
+ #define KL_PART_KEY -1         /* keylen value for incomplete key-code */
+ #define KL_PART_MAP -2         /* keylen value for incomplete mapping */
+ 
+-static int old_char = -1;      /* character put back by vungetc() */
+-static int old_mod_mask;       /* mod_mask for ungotten character */
+-
+ /*
+  * Get the next input character.
+  * Can return a special key or a multi-byte character.
+@@ -3701,11 +3708,10 @@
+  * Clear all mappings or abbreviations.
+  * 'abbr' should be FALSE for mappings, TRUE for abbreviations.
+  */
+-/*ARGSUSED*/
+     void
+ map_clear(cmdp, arg, forceit, abbr)
+     char_u     *cmdp;
+-    char_u     *arg;
++    char_u     *arg UNUSED;
+     int                forceit;
+     int                abbr;
+ {
+@@ -3734,13 +3740,12 @@
+ /*
+  * Clear all mappings in "mode".
+  */
+-/*ARGSUSED*/
+     void
+ map_clear_int(buf, mode, local, abbr)
+-    buf_T      *buf;       /* buffer for local mappings */
+-    int                mode;       /* mode in which to delete */
+-    int                local;      /* TRUE for buffer-local mappings */
+-    int                abbr;       /* TRUE for abbreviations */
++    buf_T      *buf UNUSED;    /* buffer for local mappings */
++    int                mode;           /* mode in which to delete */
++    int                local UNUSED;   /* TRUE for buffer-local mappings */
++    int                abbr;           /* TRUE for abbreviations */
+ {
+     mapblock_T *mp, **mpp;
+     int                hash;
+@@ -3816,7 +3821,11 @@
      int len = 1;
  
@@ -8797 +9421 @@
         msg_putchar('!');                       /* :map! */
      else if (mp->m_mode & INSERT)
-@@ -4702,7 +4706,7 @@
+@@ -4702,7 +4711,7 @@
                         return FAIL;
                     if (mp->m_noremap != REMAP_YES && fprintf(fd, "nore") < 0)
@@ -8806 +9430 @@
                     if (buf != NULL && fputs(" <buffer>", fd) < 0)
                         return FAIL;
-@@ -4801,7 +4805,7 @@
+@@ -4801,7 +4810,7 @@
             }
             if (IS_SPECIAL(c) || modifiers)     /* special key */
@@ -8817 +9441 @@
 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-06-05 14:24:27.000000000 -0700
++++ vim72/src/globals.h 2009-07-19 15:17:39.000000000 -0700
 @@ -482,8 +482,10 @@
  /*
@@ -8830 +9454 @@
  /*
   * When resizing the shell is postponed, remember the new size, and call
-@@ -522,7 +524,7 @@
+@@ -507,6 +509,7 @@
+ EXTERN int     clip_unnamed INIT(= FALSE);
+ EXTERN int     clip_autoselect INIT(= FALSE);
+ EXTERN int     clip_autoselectml INIT(= FALSE);
++EXTERN int     clip_html INIT(= FALSE);
+ EXTERN regprog_T *clip_exclude_prog INIT(= NULL);
+ #endif
+ 
+@@ -522,7 +525,7 @@
  EXTERN win_T   *prevwin INIT(= NULL);  /* previous window */
  # define W_NEXT(wp) ((wp)->w_next)
@@ -8839 +9471 @@
         for ((wp) = ((tp) == curtab) \
                 ? firstwin : (tp)->tp_firstwin; (wp); (wp) = (wp)->w_next)
-@@ -597,7 +599,8 @@
+@@ -536,6 +539,10 @@
+ 
+ EXTERN win_T   *curwin;        /* currently active window */
+ 
++#ifdef FEAT_AUTOCMD
++EXTERN win_T   *aucmd_win;     /* window used in aucmd_prepbuf() */
++#endif
++
+ /*
+  * The window layout is kept in a tree of frames.  topframe points to the top
+  * of the tree.
+@@ -597,7 +604,8 @@
  EXTERN int     really_exiting INIT(= FALSE);
                                 /* TRUE when we are sure to exit, e.g., after
@@ -8849 +9492 @@
                                  * otherwise only writing some messages */
  
-@@ -616,6 +619,11 @@
+@@ -616,6 +624,11 @@
  EXTERN int     curbuf_lock INIT(= 0);
                                 /* non-zero when the current buffer can't be
@@ -8861 +9504 @@
  #ifdef FEAT_EVAL
  # define HAVE_SANDBOX
-@@ -710,7 +718,7 @@
+@@ -710,7 +723,7 @@
  
  EXTERN pos_T   saved_cursor            /* w_cursor before formatting text. */
@@ -8870 +9513 @@
         ;
  
-@@ -739,10 +747,12 @@
+@@ -739,10 +752,12 @@
   */
  EXTERN JMP_BUF lc_jump_env;    /* argument to SETJMP() */
@@ -8886 +9529 @@
  
  #if defined(FEAT_MBYTE) || defined(FEAT_POSTSCRIPT)
-@@ -986,7 +996,8 @@
+@@ -800,11 +815,14 @@
+  */
+ /* length of char in bytes, including following composing chars */
+ EXTERN int (*mb_ptr2len) __ARGS((char_u *p)) INIT(= latin_ptr2len);
++/* idem, with limit on string length */
++EXTERN int (*mb_ptr2len_len) __ARGS((char_u *p, int size)) INIT(= latin_ptr2len_len);
+ /* byte length of char */
+ EXTERN int (*mb_char2len) __ARGS((int c)) INIT(= latin_char2len);
+ /* convert char to bytes, return the length */
+ EXTERN int (*mb_char2bytes) __ARGS((int c, char_u *buf)) INIT(= latin_char2bytes);
+ EXTERN int (*mb_ptr2cells) __ARGS((char_u *p)) INIT(= latin_ptr2cells);
++EXTERN int (*mb_ptr2cells_len) __ARGS((char_u *p, int size)) INIT(= latin_ptr2cells_len);
+ EXTERN int (*mb_char2cells) __ARGS((int c)) INIT(= latin_char2cells);
+ EXTERN int (*mb_off2cells) __ARGS((unsigned off, unsigned max_off)) INIT(= latin_off2cells);
+ EXTERN int (*mb_ptr2char) __ARGS((char_u *p)) INIT(= latin_ptr2char);
+@@ -950,7 +968,7 @@
+                    ;
+ EXTERN typebuf_T typebuf               /* typeahead buffer */
+ #ifdef DO_INIT
+-                   = {NULL, NULL}
++                   = {NULL, NULL, 0, 0, 0, 0, 0, 0, 0}
+ #endif
+                    ;
+ #ifdef FEAT_EX_EXTRA
+@@ -986,7 +1004,8 @@
  EXTERN FILE    *scriptout  INIT(= NULL);   /* stream to write script to */
  EXTERN int     read_cmd_fd INIT(= 0);      /* fd to read commands from */
@@ -8896 +9563 @@
  #ifdef USE_TERM_CONSOLE
  EXTERN int     term_console INIT(= FALSE); /* set to TRUE when console used */
-@@ -1022,12 +1033,13 @@
+@@ -1022,12 +1041,13 @@
  #endif
  #ifdef FEAT_AUTOCMD
@@ -8911 +9578 @@
                         ;
  #endif
-@@ -1339,7 +1351,6 @@
+@@ -1339,7 +1359,6 @@
  
  #ifdef FEAT_NETBEANS_INTG
@@ -8919 +9586 @@
  EXTERN int netbeansForcedQuit INIT(= 0);/* don't write modified files */
  EXTERN int netbeansReadFile INIT(= 1); /* OK to read from disk if != 0 */
-@@ -1548,6 +1559,14 @@
+@@ -1548,6 +1567,14 @@
  EXTERN time_t starttime;
  
@@ -8936 +9603 @@
 diff -Naur vim72.orig/src/gui_at_fs.c vim72/src/gui_at_fs.c
 --- vim72.orig/src/gui_at_fs.c  2006-05-12 02:26:24.000000000 -0700
-+++ vim72/src/gui_at_fs.c       2009-06-05 14:25:31.000000000 -0700
++++ vim72/src/gui_at_fs.c       2009-07-19 15:16:46.000000000 -0700
 @@ -829,7 +829,7 @@
      text.format = FMT8BIT;
@@ -9222 +9889 @@
 diff -Naur vim72.orig/src/gui_athena.c vim72/src/gui_athena.c
 --- vim72.orig/src/gui_athena.c 2008-06-21 12:38:58.000000000 -0700
-+++ vim72/src/gui_athena.c      2009-06-05 14:25:31.000000000 -0700
++++ vim72/src/gui_athena.c      2009-07-19 15:16:46.000000000 -0700
 @@ -86,10 +86,9 @@
   * Scrollbar callback (XtNjumpProc) for when the scrollbar is dragged with the
@@ -9479 +10146 @@
 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-06-05 14:25:31.000000000 -0700
++++ vim72/src/gui_at_sb.c       2009-07-19 15:16:46.000000000 -0700
 @@ -198,10 +198,13 @@
      /* extension       */  NULL
@@ -9729 +10396 @@
 diff -Naur vim72.orig/src/gui_beval.c vim72/src/gui_beval.c
 --- vim72.orig/src/gui_beval.c  2007-05-07 12:33:41.000000000 -0700
-+++ vim72/src/gui_beval.c       2009-06-05 14:25:31.000000000 -0700
++++ vim72/src/gui_beval.c       2009-07-19 15:16:46.000000000 -0700
 @@ -15,11 +15,10 @@
  /*
@@ -9830 +10497 @@
 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-06-05 14:25:31.000000000 -0700
++++ vim72/src/gui.c     2009-07-19 15:18:18.000000000 -0700
 @@ -139,7 +139,7 @@
                 /* The read returns when the child closes the pipe (or when
@@ -9853 +10520 @@
  #define FONTLEN 320
      char_u     font_name[FONTLEN];
+@@ -960,7 +959,7 @@
+                guicolor_T fg, bg;
+ 
+                if (
+-# ifdef HAVE_GTK2
++# if defined(HAVE_GTK2) && !defined(FEAT_HANGULIN)
+                        preedit_get_status()
+ # else
+                        im_get_status()
 @@ -1138,10 +1137,9 @@
   * Position the various GUI components (text area, menu).  The vertical
@@ -9970 +10646 @@
         }
  #ifdef FEAT_WINDOWS
-@@ -4407,7 +4407,7 @@
+@@ -3879,6 +3879,21 @@
+  * Scrollbar stuff:
+  */
+ 
++/*
++ * Called when something in the window layout has changed.
++ */
++    void
++gui_may_update_scrollbars()
++{
++    if (gui.in_use && starting == 0)
++    {
++       out_flush();
++       gui_init_which_components(NULL);
++       gui_update_scrollbars(TRUE);
++    }
++    need_mouse_correct = TRUE;
++}
++
+     void
+ gui_update_scrollbars(force)
+     int                force;      /* Force all scrollbars to get updated */
+@@ -4407,7 +4422,7 @@
      if (curwin->w_p_wrap)
         return FALSE;
@@ -9979 +10677 @@
  
      curwin->w_leftcol = (colnr_T)scrollbar_value;
-@@ -4420,7 +4420,7 @@
+@@ -4420,7 +4435,7 @@
             && longest_lnum < curwin->w_botline
             && !virtual_active())
@@ -9988 +10686 @@
             curwin->w_cursor.lnum = longest_lnum;
             curwin->w_cursor.col = 0;
-@@ -4666,11 +4666,10 @@
+@@ -4666,11 +4681,10 @@
  /*
   * Find window where the mouse pointer "y" coordinate is in.
@@ -10002 +10700 @@
  #ifdef FEAT_WINDOWS
      int                row;
-@@ -5120,11 +5119,10 @@
+@@ -5120,11 +5134,10 @@
   * of dropped files, they will be freed in this function, and caller can't use
   * fnames after call this function.
@@ -10018 +10716 @@
 diff -Naur vim72.orig/src/gui_gtk.c vim72/src/gui_gtk.c
 --- vim72.orig/src/gui_gtk.c    2008-07-31 12:48:20.000000000 -0700
-+++ vim72/src/gui_gtk.c 2009-06-05 14:25:19.000000000 -0700
++++ vim72/src/gui_gtk.c 2009-07-19 15:16:36.000000000 -0700
 @@ -285,14 +285,14 @@
      return image;
@@ -10222 +10920 @@
 diff -Naur vim72.orig/src/gui_gtk_f.c vim72/src/gui_gtk_f.c
 --- vim72.orig/src/gui_gtk_f.c  2007-05-07 12:38:02.000000000 -0700
-+++ vim72/src/gui_gtk_f.c       2009-06-05 14:25:22.000000000 -0700
++++ vim72/src/gui_gtk_f.c       2009-07-19 15:16:39.000000000 -0700
 @@ -227,14 +227,14 @@
  
@@ -10306 +11004 @@
 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-06-05 14:26:08.000000000 -0700
-@@ -412,6 +412,7 @@
++++ vim72/src/gui_gtk_x11.c     2009-07-19 15:18:26.000000000 -0700
+@@ -107,6 +107,7 @@
+     TARGET_UTF8_STRING,
+     TARGET_STRING,
+     TARGET_COMPOUND_TEXT,
++    TARGET_HTML,
+     TARGET_TEXT,
+     TARGET_TEXT_URI_LIST,
+     TARGET_TEXT_PLAIN,
+@@ -123,6 +124,7 @@
+     {VIMENC_ATOM_NAME, 0, TARGET_VIMENC},
+     {VIM_ATOM_NAME,    0, TARGET_VIM},
+ #ifdef FEAT_MBYTE
++    {"text/html",      0, TARGET_HTML},
+     {"UTF8_STRING",    0, TARGET_UTF8_STRING},
+ #endif
+     {"COMPOUND_TEXT",  0, TARGET_COMPOUND_TEXT},
+@@ -140,6 +142,7 @@
+ {
+     {"text/uri-list",  0, TARGET_TEXT_URI_LIST},
+ # ifdef FEAT_MBYTE
++    {"text/html",      0, TARGET_HTML},
+     {"UTF8_STRING",    0, TARGET_UTF8_STRING},
+ # endif
+     {"STRING",         0, TARGET_STRING},
+@@ -178,6 +181,7 @@
+  * Atoms used to control/reference X11 selections.
+  */
+ #ifdef FEAT_MBYTE
++static GdkAtom html_atom = GDK_NONE;
+ static GdkAtom utf8_string_atom = GDK_NONE;
+ #endif
+ #ifndef HAVE_GTK2
+@@ -412,6 +416,7 @@
  #endif
  #if defined(FEAT_GUI_GNOME) && defined(FEAT_SESSION)
@@ -10315 +11045 @@
  static int found_iconic_arg = FALSE;
  
-@@ -449,8 +450,10 @@
+@@ -449,8 +454,10 @@
         char_u buf[MAXPATHL];
  
@@ -10328 +11058 @@
  #endif
  
-@@ -611,6 +614,9 @@
+@@ -611,6 +618,9 @@
  gui_mch_free_all()
  {
@@ -10338 +11068 @@
  #endif
  
-@@ -619,9 +625,10 @@
+@@ -619,9 +629,10 @@
   * Doesn't seem possible, since check_copy_area() relies on
   * this information.  --danielk
@@ -10351 +11081 @@
      gui.visibility = event->state;
      /*
-@@ -638,9 +645,10 @@
+@@ -638,9 +649,10 @@
  /*
   * Redraw the corresponding portions of the screen.
@@ -10364 +11094 @@
      /* Skip this when the GUI isn't set up yet, will redraw later. */
      if (gui.starting)
-@@ -668,9 +676,10 @@
+@@ -668,9 +680,10 @@
  /*
   * Handle changes to the "Comm" property
@@ -10377 +11107 @@
      if (event->type == GDK_PROPERTY_NOTIFY
             && event->state == (int)GDK_PROPERTY_NEW_VALUE
-@@ -740,9 +749,8 @@
+@@ -740,9 +753,8 @@
      blink_state = BLINK_NONE;
  }
@@ -10388 +11118 @@
      if (blink_state == BLINK_ON)
      {
-@@ -781,9 +789,10 @@
+@@ -781,9 +793,10 @@
      }
  }
@@ -10401 +11131 @@
      if (blink_state == BLINK_NONE)
         gui_mch_start_blink();
-@@ -795,9 +804,10 @@
+@@ -795,9 +808,10 @@
      return FALSE;
  }
@@ -10414 +11144 @@
      if (blink_state != BLINK_NONE)
         gui_mch_stop_blink();
-@@ -805,9 +815,10 @@
+@@ -805,9 +819,10 @@
      return FALSE;
  }
@@ -10427 +11157 @@
      gui_focus_change(TRUE);
  
-@@ -826,9 +837,10 @@
+@@ -826,9 +841,10 @@
      return TRUE;
  }
@@ -10440 +11170 @@
      gui_focus_change(FALSE);
  
-@@ -956,9 +968,10 @@
+@@ -956,9 +972,10 @@
  /*
   * Main keyboard handler:
@@ -10453 +11183 @@
  #ifdef HAVE_GTK2
      /* 256 bytes is way over the top, but for safety let's reduce it only
-@@ -1225,9 +1238,10 @@
+@@ -1225,9 +1242,10 @@
  }
  
@@ -10466 +11196 @@
      /*
       * GTK+ 2 input methods may do fancy stuff on key release events too.
-@@ -1243,11 +1257,10 @@
+@@ -1243,11 +1261,10 @@
   * Selection handlers:
   */
@@ -10480 +11210 @@
      if (event->selection == clip_plus.gtk_sel_atom)
         clip_lose_selection(&clip_plus);
-@@ -1265,12 +1278,11 @@
+@@ -1265,12 +1282,11 @@
  #define RS_FAIL        2       /* selection_received_cb() called and failed */
  static int received_selection = RS_NONE;
@@ -10496 +11226 @@
      VimClipboard    *cbd;
      char_u         *text;
-@@ -1414,13 +1426,12 @@
+@@ -1352,6 +1368,24 @@
+            else
+                text = tmpbuf_utf8;
+        }
++       else if (len >= 2 && text[0] == 0xff && text[1] == 0xfe)
++       {
++           vimconv_T conv;
++
++           /* UTF-16, we get this for HTML */
++           conv.vc_type = CONV_NONE;
++           convert_setup_ext(&conv, (char_u *)"utf-16le", FALSE, p_enc, TRUE);
++
++           if (conv.vc_type != CONV_NONE)
++           {
++               text += 2;
++               len -= 2;
++               tmpbuf = string_convert(&conv, text, &len);
++               convert_setup(&conv, NULL, NULL);
++           }
++           if (tmpbuf != NULL)
++               text = tmpbuf;
++       }
+     }
+ #else /* !HAVE_GTK2 */
+ # ifdef FEAT_MBYTE
+@@ -1414,13 +1448,12 @@
   * Prepare our selection data for passing it to the external selection
   * client.
@@ -10513 +11268 @@
      char_u         *string;
      char_u         *tmpbuf;
-@@ -1678,7 +1689,7 @@
+@@ -1440,6 +1473,7 @@
+ 
+     if (info != (guint)TARGET_STRING
+ #ifdef FEAT_MBYTE
++           && (!clip_html || info != (guint)TARGET_HTML)
+            && info != (guint)TARGET_UTF8_STRING
+            && info != (guint)TARGET_VIMENC
+ #endif
+@@ -1475,6 +1509,40 @@
+     }
+ 
+ #ifdef FEAT_MBYTE
++    else if (info == (guint)TARGET_HTML)
++    {
++       vimconv_T conv;
++
++       /* Since we get utf-16, we probably should set it as well. */
++       conv.vc_type = CONV_NONE;
++       convert_setup_ext(&conv, p_enc, TRUE, (char_u *)"utf-16le", FALSE);
++       if (conv.vc_type != CONV_NONE)
++       {
++           tmpbuf = string_convert(&conv, string, &length);
++           convert_setup(&conv, NULL, NULL);
++           vim_free(string);
++           string = tmpbuf;
++       }
++
++       /* Prepend the BOM: "fffe" */
++       if (string != NULL)
++       {
++           tmpbuf = alloc(length + 2);
++           tmpbuf[0] = 0xff;
++           tmpbuf[1] = 0xfe;
++           mch_memmove(tmpbuf + 2, string, (size_t)length);
++           vim_free(string);
++           string = tmpbuf;
++           length += 2;
++
++           selection_data->type = selection_data->target;
++           selection_data->format = 16;        /* 16 bits per char */
++           gtk_selection_data_set(selection_data, html_atom, 16,
++                                                             string, length);
++           vim_free(string);
++       }
++       return;
++    }
+     else if (info == (guint)TARGET_VIMENC)
+     {
+        int l = STRLEN(p_enc);
+@@ -1678,7 +1746,7 @@
  
         offshoot = dx > dy ? dx : dy;
@@ -10522 +11326 @@
          *
          * One could think endlessly about the most ergonomic variant here.
-@@ -1707,9 +1718,8 @@
+@@ -1707,9 +1775,8 @@
  /*
   * Timer used to recognize multiple clicks of the mouse button.
@@ -10533 +11337 @@
      int                    x;
      int                    y;
-@@ -1749,9 +1759,10 @@
+@@ -1749,9 +1816,10 @@
      return FALSE;
  }
@@ -10546 +11350 @@
      if (event->is_hint)
      {
-@@ -1777,9 +1788,10 @@
+@@ -1777,9 +1845,10 @@
   * by our own timeout mechanism instead of the one provided by GTK+ itself.
   * This is due to the way the generic VIM code is recognizing multiple clicks.
@@ -10559 +11363 @@
      int button;
      int repeated_click = FALSE;
-@@ -1855,9 +1867,10 @@
+@@ -1855,9 +1924,10 @@
   * GTK+ 2 doesn't handle mouse buttons 4, 5, 6 and 7 the same way as GTK+ 1.
   * Instead, it abstracts scrolling via the new GdkEventScroll.
@@ -10572 +11376 @@
      int            button;
      int_u   vim_modifiers;
-@@ -1896,9 +1909,10 @@
+@@ -1896,9 +1966,10 @@
  #endif /* HAVE_GTK2 */
  
@@ -10585 +11389 @@
      int x, y;
      int_u vim_modifiers;
-@@ -2100,7 +2114,6 @@
+@@ -2100,7 +2171,6 @@
  /*
   * DND receiver.
@@ -10593 +11397 @@
  drag_data_received_cb(GtkWidget                *widget,
                       GdkDragContext    *context,
-@@ -2109,7 +2122,7 @@
+@@ -2109,7 +2179,7 @@
                       GtkSelectionData  *data,
                       guint             info,
@@ -10602 +11406 @@
      GdkModifierType state;
  
-@@ -2143,7 +2156,6 @@
+@@ -2143,7 +2213,6 @@
   * be abandoned and pop up a dialog asking the user for confirmation if
   * necessary.
@@ -10610 +11414 @@
  sm_client_check_changed_any(GnomeClient            *client,
                             gint            key,
-@@ -2251,7 +2263,6 @@
+@@ -2251,7 +2320,6 @@
   * for confirmation if necessary.  Save the current editing session and tell
   * the session manager how to restart Vim.
@@ -10618 +11422 @@
  sm_client_save_yourself(GnomeClient        *client,
                         gint                phase,
-@@ -2339,7 +2350,6 @@
+@@ -2339,7 +2407,6 @@
   * here since "save_yourself" has been emitted before (unless serious trouble
   * is happening).
@@ -10626 +11430 @@
  sm_client_die(GnomeClient *client, gpointer data)
  {
-@@ -2379,10 +2389,9 @@
+@@ -2379,10 +2446,9 @@
  /*
   * GTK tells us that XSMP needs attention
@@ -10638 +11442 @@
      gpointer           data;
  {
-@@ -2480,16 +2489,18 @@
+@@ -2480,16 +2546,18 @@
   * WM_SAVE_YOURSELF hack it actually stores the session...  And yes,
   * it should work with KDE as well.
@@ -10660 +11464 @@
         out_flush();
         ml_sync_all(FALSE, FALSE); /* preserve all swap files */
-@@ -2512,7 +2523,6 @@
+@@ -2512,7 +2580,6 @@
  /*
   * GDK handler for X ClientMessage events.
@@ -10668 +11472 @@
  gdk_wm_protocols_filter(GdkXEvent *xev, GdkEvent *event, gpointer data)
  {
-@@ -2558,9 +2568,8 @@
+@@ -2558,9 +2625,8 @@
  /*
   * Setup the window icon & xcmdsrv comm after the main window has been realized.
@@ -10679 +11483 @@
  /* If you get an error message here, you still need to unpack the runtime
   * archive! */
-@@ -2712,11 +2721,10 @@
+@@ -2712,11 +2778,10 @@
  }
  
@@ -10693 +11497 @@
      if (!gtk_widget_has_screen(widget))
         return;
-@@ -2757,9 +2765,8 @@
+@@ -2757,9 +2822,8 @@
   * Don't try to set any VIM scrollbar sizes anywhere here. I'm relying on the
   * fact that the main VIM engine doesn't take them into account anywhere.
@@ -10704 +11508 @@
      GtkWidget *sbar;
  
-@@ -2789,9 +2796,8 @@
+@@ -2789,9 +2853,8 @@
  /*
   * Properly clean up on shutdown.
@@ -10715 +11519 @@
      /* Don't write messages to the GUI anymore */
      full_screen = FALSE;
-@@ -2827,11 +2833,10 @@
+@@ -2827,11 +2890,10 @@
  #endif
  }
@@ -10730 +11534 @@
      gui_mch_new_colors();
  }
-@@ -2840,9 +2845,10 @@
+@@ -2840,9 +2902,10 @@
   * Callback routine for the "delete_event" signal on the toplevel window.
   * Tries to vim gracefully, or refuses to exit with changed buffers.
@@ -10743 +11547 @@
      gui_shell_closed();
      return TRUE;
-@@ -2964,7 +2970,7 @@
+@@ -2964,7 +3027,7 @@
  
      /* At start-up, don't try to set the hints until the initial
@@ -10752 +11556 @@
      if (!(force_width && force_height)  &&  init_window_hints_state > 0)
      {
-@@ -3142,9 +3148,8 @@
+@@ -3142,9 +3205,8 @@
  /*
   * Handle selecting an item in the tab line popup menu.
@@ -10763 +11567 @@
      /* Add the string cmd into input buffer */
      send_tabline_menu_event(clicked_page, (int)(long)user_data);
-@@ -3244,13 +3249,12 @@
+@@ -3244,13 +3306,12 @@
  /*
   * Handle selecting one of the tabs.
@@ -10780 +11584 @@
      if (!ignore_tabline_evt)
      {
-@@ -3784,7 +3788,7 @@
+@@ -3460,6 +3521,7 @@
+ 
+     /* Initialise atoms */
+ #ifdef FEAT_MBYTE
++    html_atom = gdk_atom_intern("text/html", FALSE);
+     utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE);
+ #endif
+ #ifndef HAVE_GTK2
+@@ -3784,7 +3846,7 @@
  #endif
  
@@ -10789 +11601 @@
  
      /*
-@@ -3922,10 +3926,10 @@
+@@ -3922,10 +3984,10 @@
  /*
   * This signal informs us about the need to rearrange our sub-widgets.
@@ -10803 +11615 @@
      int usable_height = event->height;
  
-@@ -3948,9 +3952,8 @@
+@@ -3948,9 +4010,8 @@
   * We can't do much more here than to trying to preserve what had been done,
   * since the window is already inevitably going away.
@@ -10814 +11626 @@
      /* Don't write messages to the GUI anymore */
      full_screen = FALSE;
-@@ -3980,9 +3983,8 @@
+@@ -3980,9 +4041,8 @@
   * scrollbar init.), actually do the standard hinst and stop the timer.
   * We'll not let the default hints be set while this timer's active.
@@ -10825 +11637 @@
      if (init_window_hints_state == 1)
      {
-@@ -4055,7 +4057,7 @@
+@@ -4055,7 +4115,7 @@
             Columns = w;
         if (mask & HeightValue)
@@ -10834 +11646 @@
             Rows = h;
         }
-@@ -4070,14 +4072,14 @@
+@@ -4070,14 +4130,14 @@
  
         if (mask & (XValue | YValue))
@@ -10855 +11667 @@
             gtk_window_move(GTK_WINDOW(gui.mainwin), x, y);
  #else
-@@ -4229,9 +4231,8 @@
+@@ -4229,9 +4289,8 @@
  }
  
@@ -10866 +11678 @@
      if (gui.mainwin != NULL)
         gtk_widget_destroy(gui.mainwin);
-@@ -4286,7 +4287,6 @@
+@@ -4286,7 +4345,6 @@
   * report the new size through form_configure_event().  That caused the window
   * layout to be messed up.
@@ -10874 +11686 @@
  force_shell_resize_idle(gpointer data)
  {
-@@ -4314,12 +4314,11 @@
+@@ -4314,12 +4372,11 @@
  /*
   * Set the windows size.
@@ -10890 +11702 @@
  #ifndef HAVE_GTK2
      /* Hack: When the form already is at the desired size, the window might
-@@ -4413,9 +4412,8 @@
+@@ -4413,9 +4470,8 @@
  }
  
@@ -10901 +11713 @@
  # ifdef HAVE_GTK2
      if (title != NULL && output_conv.vc_type != CONV_NONE)
-@@ -4493,7 +4491,6 @@
+@@ -4493,7 +4549,6 @@
   * Get a font structure for highlighting.
   * "cbdata" is a pointer to the global gui structure.
@@ -10909 +11721 @@
  font_sel_ok(GtkWidget *wgt, gpointer cbdata)
  {
-@@ -4509,7 +4506,6 @@
+@@ -4509,7 +4564,6 @@
         gtk_main_quit();
  }
@@ -10917 +11729 @@
  font_sel_cancel(GtkWidget *wgt, gpointer cbdata)
  {
-@@ -4520,7 +4516,6 @@
+@@ -4520,7 +4574,6 @@
         gtk_main_quit();
  }
@@ -10925 +11737 @@
  font_sel_destroy(GtkWidget *wgt, gpointer cbdata)
  {
-@@ -4620,7 +4615,6 @@
+@@ -4620,7 +4673,6 @@
  /*
   * Try to load the requested fontset.
@@ -10933 +11745 @@
  gui_mch_get_fontset(char_u *name, int report_error, int fixed_width)
  {
-@@ -4863,7 +4857,7 @@
+@@ -4863,7 +4915,7 @@
      styled_font[1] = &gui.ital_font;
      styled_font[2] = &gui.boldital_font;
@@ -10942 +11754 @@
         if (*styled_font[i])
         {
-@@ -5012,9 +5006,8 @@
+@@ -5012,9 +5064,8 @@
   * Initialize Vim to use the font or fontset with the given name.
   * Return FAIL if the font could not be loaded, OK otherwise.
@@ -10953 +11765 @@
  #ifdef HAVE_GTK2
      PangoFontDescription    *font_desc;
-@@ -5326,9 +5319,8 @@
+@@ -5326,9 +5377,8 @@
  /*
   * Return the name of font "font" in allocated memory.
@@ -10964 +11776 @@
  # ifdef HAVE_GTK2
      if (font != NOFONT)
-@@ -5732,7 +5724,7 @@
+@@ -5732,7 +5782,7 @@
  {
      int                        i;
@@ -10973 +11785 @@
  
      /* Undercurl: draw curl at the bottom of the character cell. */
-@@ -6402,7 +6394,6 @@
+@@ -6085,12 +6135,15 @@
+ # ifdef FEAT_MBYTE
+            if (enc_utf8)
+            {
+-               c = utf_ptr2char(p);
++               int pcc[MAX_MCO];
++
++               /* TODO: use the composing characters */
++               c = utfc_ptr2char_len(p, &pcc, len - (p - s));
+                if (c >= 0x10000)       /* show chars > 0xffff as ? */
+                    c = 0xbf;
+                buf[textlen].byte1 = c >> 8;
+                buf[textlen].byte2 = c;
+-               p += utf_ptr2len(p);
++               p += utfc_ptr2len_len(p, len - (p - s));
+                width += utf_char2cells(c);
+            }
+            else
+@@ -6114,8 +6167,8 @@
+        if (has_mbyte)
+        {
+            width = 0;
+-           for (p = s; p < s + len; p += (*mb_ptr2len)(p))
+-               width += (*mb_ptr2cells)(p);
++           for (p = s; p < s + len; p += (*mb_ptr2len_len)(p, len - (p - s)))
++               width += (*mb_ptr2cells_len)(p, len - (p - s));
+        }
+        else
+ # endif
+@@ -6402,7 +6455,6 @@
  /*
   * Callback function, used when data is available on the SNiFF connection.
@@ -10981 +11822 @@
  sniff_request_cb(
      gpointer   data,
-@@ -6711,9 +6702,8 @@
+@@ -6665,12 +6717,14 @@
+ {
+     GdkAtom    target;
+     unsigned   i;
+-    int                nbytes;
+-    char_u     *buffer;
+     time_t     start;
+ 
+     for (i = 0; i < N_SELECTION_TARGETS; ++i)
+     {
++#ifdef FEAT_MBYTE
++       if (!clip_html && selection_targets[i].info == TARGET_HTML)
++           continue;
++#endif
+        received_selection = RS_NONE;
+        target = gdk_atom_intern(selection_targets[i].target, FALSE);
+ 
+@@ -6690,30 +6744,14 @@
+     }
+ 
+     /* Final fallback position - use the X CUT_BUFFER0 store */
+-    nbytes = 0;
+-    buffer = (char_u *)XFetchBuffer(GDK_WINDOW_XDISPLAY(gui.mainwin->window),
+-                                   &nbytes, 0);
+-    if (nbytes > 0)
+-    {
+-       /* Got something */
+-       clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd);
+-       if (p_verbose > 0)
+-       {
+-           verbose_enter();
+-           smsg((char_u *)_("Used CUT_BUFFER0 instead of empty selection"));
+-           verbose_leave();
+-       }
+-    }
+-    if (buffer != NULL)
+-       XFree(buffer);
++    yank_cut_buffer0(GDK_WINDOW_XDISPLAY(gui.mainwin->window), cbd);
+ }
+ 
  /*
   * Disown the selection.
@@ -10992 +11872 @@
      /* WEIRD: when using NULL to actually disown the selection, we lose the
       * selection the first time we own it. */
-@@ -6741,9 +6731,8 @@
+@@ -6741,9 +6779,8 @@
   * Send the current selection to the clipboard.  Do nothing for X because we
   * will fill in the selection only when requested by another app.
@@ -11003 +11883 @@
  }
  
-@@ -6950,7 +6939,7 @@
+@@ -6950,7 +6987,7 @@
             else
                 id &= ~1;       /* they are always even (why?) */
@@ -11014 +11894 @@
 diff -Naur vim72.orig/src/gui_motif.c vim72/src/gui_motif.c
 --- vim72.orig/src/gui_motif.c  2008-06-07 06:06:33.000000000 -0700
-+++ vim72/src/gui_motif.c       2009-06-05 14:25:31.000000000 -0700
++++ vim72/src/gui_motif.c       2009-07-19 15:16:46.000000000 -0700
 @@ -117,10 +117,9 @@
   * Call-back routines.
@@ -11377 +12257 @@
 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-06-05 14:25:31.000000000 -0700
++++ vim72/src/gui_x11.c 2009-07-19 15:16:46.000000000 -0700
 @@ -570,22 +570,20 @@
   * Call-back routines.
@@ -11822 +12702 @@
 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-06-05 14:25:31.000000000 -0700
++++ vim72/src/gui_xmdlg.c       2009-07-19 15:16:46.000000000 -0700
 @@ -369,10 +369,10 @@
      char       buf[TEMP_BUF_SIZE];
@@ -12044 +12924 @@
 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-06-05 14:25:31.000000000 -0700
++++ vim72/src/gui_xmebw.c       2009-07-19 15:16:46.000000000 -0700
 @@ -235,13 +235,12 @@
      return tmp;
@@ -12171 +13051 @@
 diff -Naur vim72.orig/src/hardcopy.c vim72/src/hardcopy.c
 --- vim72.orig/src/hardcopy.c   2008-01-11 12:46:20.000000000 -0800
-+++ vim72/src/hardcopy.c        2009-06-05 14:25:02.000000000 -0700
++++ vim72/src/hardcopy.c        2009-07-19 15:16:23.000000000 -0700
 @@ -442,12 +442,11 @@
  /*
@@ -12254 +13134 @@
 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-06-05 14:25:02.000000000 -0700
-@@ -74,7 +74,7 @@
++++ vim72/src/if_cscope.c       2009-07-19 15:18:44.000000000 -0700
+@@ -46,7 +46,6 @@
+ static int         cs_find __ARGS((exarg_T *eap));
+ static int         cs_find_common __ARGS((char *opt, char *pat, int, int, int));
+ static int         cs_help __ARGS((exarg_T *eap));
+-static void        cs_init __ARGS((void));
+ static void        clear_csinfo __ARGS((int i));
+ static int         cs_insert_filelist __ARGS((char *, char *, char *,
+                        struct stat *));
+@@ -66,7 +65,10 @@
+ static int         cs_show __ARGS((exarg_T *eap));
+ 
+ 
+-static csinfo_T            csinfo[CSCOPE_MAX_CONNECTIONS];
++static csinfo_T *   csinfo = NULL;
++static int         csinfo_size = 0;    /* number of items allocated in
++                                          csinfo[] */
++
+ static int         eap_arg_len;    /* length of eap->arg, set in
+                                       cs_lookup_cmd() */
+ static cscmd_T     cs_cmds[] =
+@@ -74,7 +76,7 @@
      { "add",   cs_add,
                 N_("Add a new database"),     "add file|dir [pre-path] [flags]", 0 },
@@ -12264 +13164 @@
                 N_("Show this message"),      "help", 0 },
      { "kill",  cs_kill,
-@@ -83,7 +83,7 @@
+@@ -83,7 +85,7 @@
                 N_("Reinit all connections"), "reset", 0 },
      { "show",  cs_show,
@@ -12273 +13173 @@
  
      static void
-@@ -93,12 +93,128 @@
+@@ -93,12 +95,125 @@
      (void)EMSG2(_("E560: Usage: cs[cope] %s"), cs_cmds[(int)x].usage);
  }
@@ -12328 +13228 @@
 +    case EXP_CSCOPE_KILL:
 +       {
-+           static char_u       connection[2];
++           static char connection[5];
 +
 +           /* ":cscope kill" accepts connection numbers or partial names of
@@ -12334 +13234 @@
 +            * with connection numbers. -1 can also be used to kill all
 +            * connections. */
-+           for (i = 0, current_idx = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
++           for (i = 0, current_idx = 0; i < csinfo_size; i++)
 +           {
 +               if (csinfo[i].fname == NULL)
@@ -12340 +13240 @@
 +               if (current_idx++ == idx)
 +               {
-+                   /* Connection number fits in one character since
-+                    * CSCOPE_MAX_CONNECTIONS is < 10 */
-+                   connection[0] = i + '0';
-+                   connection[1] = NUL;
-+                   return connection;
++                   vim_snprintf(connection, sizeof(connection), "%d", i);
++                   return (char_u *)connection;
 +               }
 +           }
@@ -12405 +13302 @@
      static void
  do_cscope_general(eap, make_split)
-@@ -379,10 +495,9 @@
+@@ -107,7 +222,6 @@
+ {
+     cscmd_T *cmdp;
+ 
+-    cs_init();
+     if ((cmdp = cs_lookup_cmd(eap)) == NULL)
+     {
+        cs_help(eap);
+@@ -168,8 +282,6 @@
+ {
+     int ret = FALSE;
+ 
+-    cs_init();
+-
+     if (*eap->arg == NUL)
+     {
+        (void)EMSG(_("E562: Usage: cstag <ident>"));
+@@ -325,7 +437,7 @@
+     if (num < 0 || num > 4 || (num > 0 && !dbpath))
+        return FALSE;
+ 
+-    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
++    for (i = 0; i < csinfo_size; i++)
+     {
+        if (!csinfo[i].fname)
+            continue;
+@@ -379,10 +491,9 @@
   *
   * MAXPATHL 256
@@ -12417 +13340 @@
      char *fname, *ppath, *flags = NULL;
  
-@@ -659,6 +774,7 @@
+@@ -569,7 +680,7 @@
+     short i;
+     short cnt = 0;
+ 
+-    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
++    for (i = 0; i < csinfo_size; i++)
+     {
+        if (csinfo[i].fname != NULL)
+            cnt++;
+@@ -659,6 +770,7 @@
  {
      char *cmd;
@@ -12425 +13357 @@
      switch (csoption[0])
      {
-@@ -692,10 +808,17 @@
+@@ -692,10 +804,17 @@
         return NULL;
      }
@@ -12445 +13377 @@
      return cmd;
  } /* cs_create_cmd */
-@@ -869,7 +992,7 @@
+@@ -869,7 +988,7 @@
         vim_free(ppath);
  
@@ -12454 +13386 @@
  
         exit(127);
-@@ -1167,20 +1290,36 @@
+@@ -989,7 +1108,8 @@
+ {
+     int i;
+     char *cmd;
+-    int nummatches[CSCOPE_MAX_CONNECTIONS], totmatches;
++    int *nummatches;
++    int totmatches;
+ #ifdef FEAT_QUICKFIX
+     char cmdletter;
+     char *qfpos;
+@@ -1000,13 +1120,17 @@
+     if (cmd == NULL)
+        return FALSE;
+ 
++    nummatches = (int *)alloc(sizeof(int)*csinfo_size);
++    if (nummatches == NULL)
++       return FALSE;
++
+     /* send query to all open connections, then count the total number
+      * of matches so we can alloc matchesp all in one swell foop
+      */
+-    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
++    for (i = 0; i < csinfo_size; i++)
+        nummatches[i] = 0;
+     totmatches = 0;
+-    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
++    for (i = 0; i < csinfo_size; i++)
+     {
+        if (csinfo[i].fname == NULL || csinfo[i].to_fp == NULL)
+            continue;
+@@ -1031,7 +1155,10 @@
+        char *buf;
+ 
+        if (!verbose)
++       {
++           vim_free(nummatches);
+            return FALSE;
++       }
+ 
+        buf = (char *)alloc((unsigned)(strlen(opt) + strlen(pat) + strlen(nf)));
+        if (buf == NULL)
+@@ -1042,6 +1169,7 @@
+            (void)EMSG(buf);
+            vim_free(buf);
+        }
++       vim_free(nummatches);
+        return FALSE;
+     }
+ 
+@@ -1094,6 +1222,7 @@
+                (void)EMSG(buf);
+                vim_free(buf);
+            }
++           vim_free(nummatches);
+            return FALSE;
+        }
+     }
+@@ -1141,6 +1270,7 @@
+        }
+        mch_remove(tmp);
+        vim_free(tmp);
++       vim_free(nummatches);
+        return TRUE;
+     }
+     else
+@@ -1152,6 +1282,7 @@
+        /* read output */
+        cs_fill_results((char *)pat, totmatches, nummatches, &matches,
+                                                         &contexts, &matched);
++       vim_free(nummatches);
+        if (matches == NULL)
+            return FALSE;
+ 
+@@ -1167,20 +1298,36 @@
   *
   * print help
@@ -12496 +13501 @@
      }
  
-@@ -1257,13 +1396,12 @@
+@@ -1189,26 +1336,6 @@
+ } /* cs_help */
+ 
+ 
+-/*
+- * PRIVATE: cs_init
+- *
+- * initialize cscope structure if not already
+- */
+-    static void
+-cs_init()
+-{
+-    short i;
+-    static int init_already = FALSE;
+-
+-    if (init_already)
+-       return;
+-
+-    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+-       clear_csinfo(i);
+-
+-    init_already = TRUE;
+-} /* cs_init */
+-
+     static void
+ clear_csinfo(i)
+     int            i;
+@@ -1257,13 +1384,12 @@
   *
   * insert a new cscope database filename into the filelist
@@ -12511 +13543 @@
      short      i, j;
  #ifndef UNIX
-@@ -1419,10 +1557,9 @@
+@@ -1306,7 +1432,7 @@
+ #endif
+ 
+     i = -1; /* can be set to the index of an empty item in csinfo */
+-    for (j = 0; j < CSCOPE_MAX_CONNECTIONS; j++)
++    for (j = 0; j < csinfo_size; j++)
+     {
+        if (csinfo[j].fname != NULL
+ #if defined(UNIX)
+@@ -1333,9 +1459,25 @@
+ 
+     if (i == -1)
+     {
+-       if (p_csverbose)
+-           (void)EMSG(_("E569: maximum number of cscope connections reached"));
+-       return -1;
++       i = csinfo_size;
++       if (csinfo_size == 0)
++       {
++           /* First time allocation: allocate only 1 connection. It should
++            * be enough for most users.  If more is needed, csinfo will be
++            * reallocated. */
++           csinfo_size = 1;
++           csinfo = (csinfo_T *)alloc_clear(sizeof(csinfo_T));
++       }
++       else
++       {
++           /* Reallocate space for more connections. */
++           csinfo_size *= 2;
++           csinfo = vim_realloc(csinfo, sizeof(csinfo_T)*csinfo_size);
++       }
++       if (csinfo == NULL)
++           return -1;
++       for (j = csinfo_size/2; j < csinfo_size; j++)
++           clear_csinfo(j);
+     }
+ 
+     if ((csinfo[i].fname = (char *)alloc((unsigned)strlen(fname)+1)) == NULL)
+@@ -1419,10 +1561,9 @@
   *
   * nuke em
@@ -12523 +13593 @@
      char *stok;
      short i;
-@@ -2099,7 +2236,6 @@
+@@ -1443,15 +1584,14 @@
+        /* It must be part of a name.  We will try to find a match
+         * within all the names in the csinfo data structure
+         */
+-       for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
++       for (i = 0; i < csinfo_size; i++)
+        {
+            if (csinfo[i].fname != NULL && strstr(csinfo[i].fname, stok))
+                break;
+        }
+     }
+ 
+-    if ((i >= CSCOPE_MAX_CONNECTIONS || i < -1 || csinfo[i].fname == NULL)
+-           && i != -1)
++    if ((i != -1) && (i >= csinfo_size || i < -1 || csinfo[i].fname == NULL))
+     {
+        if (p_csverbose)
+            (void)EMSG2(_("E261: cscope connection %s not found"), stok);
+@@ -1460,7 +1600,7 @@
+     {
+        if (i == -1)
+        {
+-           for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
++           for (i = 0; i < csinfo_size; i++)
+            {
+                if (csinfo[i].fname)
+                    cs_kill_execute(i, csinfo[i].fname);
+@@ -1720,7 +1860,7 @@
+     if (buf == NULL)
+        return;
+ 
+-    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
++    for (i = 0; i < csinfo_size; i++)
+     {
+        if (nummatches_a[i] < 1)
+            continue;
+@@ -1792,7 +1932,7 @@
+     if ((cntxts = (char **)alloc(sizeof(char *) * totmatches)) == NULL)
+        goto parse_out;
+ 
+-    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
++    for (i = 0; i < csinfo_size; i++)
+     {
+        if (nummatches_a[i] < 1)
+            continue;
+@@ -2099,7 +2239,6 @@
  /*
   * Used to catch and ignore SIGALRM below.
@@ -12531 +13646 @@
  sig_handler SIGDEFARG(sigarg)
  {
-@@ -2239,10 +2375,9 @@
+@@ -2239,19 +2378,21 @@
   *
   * calls cs_kill on all cscope connections then reinits
@@ -12543 +13658 @@
      char       **dblist = NULL, **pplist = NULL, **fllist = NULL;
      int        i;
-@@ -2355,10 +2490,9 @@
+     char buf[20]; /* for sprintf " (#%d)" */
+ 
++    if (csinfo_size == 0)
++       return CSCOPE_SUCCESS;
++
+     /* malloc our db and ppath list */
+-    dblist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *));
+-    pplist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *));
+-    fllist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *));
++    dblist = (char **)alloc(csinfo_size * sizeof(char *));
++    pplist = (char **)alloc(csinfo_size * sizeof(char *));
++    fllist = (char **)alloc(csinfo_size * sizeof(char *));
+     if (dblist == NULL || pplist == NULL || fllist == NULL)
+     {
+        vim_free(dblist);
+@@ -2260,7 +2401,7 @@
+        return CSCOPE_FAILURE;
+     }
+ 
+-    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
++    for (i = 0; i < csinfo_size; i++)
+     {
+        dblist[i] = csinfo[i].fname;
+        pplist[i] = csinfo[i].ppath;
+@@ -2270,7 +2411,7 @@
+     }
+ 
+     /* rebuild the cscope connection list */
+-    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
++    for (i = 0; i < csinfo_size; i++)
+     {
+        if (dblist[i] != NULL)
+        {
+@@ -2355,10 +2496,9 @@
   *
   * show all cscope connections
@@ -12555 +13703 @@
      short i;
      if (cs_cnt_connections() == 0)
+@@ -2368,7 +2508,7 @@
+        MSG_PUTS_ATTR(
+            _(" # pid    database name                       prepend path\n"),
+            hl_attr(HLF_T));
+-       for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
++       for (i = 0; i < csinfo_size; i++)
+        {
+            if (csinfo[i].fname == NULL)
+                continue;
+@@ -2397,8 +2537,10 @@
+ {
+     int i;
+ 
+-    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
++    for (i = 0; i < csinfo_size; i++)
+        cs_release_csp(i, TRUE);
++    vim_free(csinfo);
++    csinfo_size = 0;
+ }
+ 
+ #endif /* FEAT_CSCOPE */
 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-06-05 14:14:12.000000000 -0700
-@@ -42,17 +42,6 @@
++++ vim72/src/if_cscope.h       2009-07-19 15:18:44.000000000 -0700
+@@ -25,7 +25,6 @@
+ 
+ #define CSCOPE_SUCCESS         0
+ #define CSCOPE_FAILURE         -1
+-#define CSCOPE_MAX_CONNECTIONS 8   /* you actually need more? */
+ 
+ #define        CSCOPE_DBFILE           "cscope.out"
+ #define        CSCOPE_PROMPT           ">> "
+@@ -42,17 +41,6 @@
   * f 7name     Find this file
   * i 8name     Find files #including this file
@@ -12578 +13755 @@
 diff -Naur vim72.orig/src/if_mzsch.c vim72/src/if_mzsch.c
 --- vim72.orig/src/if_mzsch.c   2007-07-01 09:44:49.000000000 -0700
-+++ vim72/src/if_mzsch.c        2009-06-05 14:25:19.000000000 -0700
++++ vim72/src/if_mzsch.c        2009-07-19 15:18:39.000000000 -0700
 @@ -667,13 +667,11 @@
      static void CALLBACK
@@ -12595 +13772 @@
      pascal void
  timer_proc(EventLoopTimerRef theTimer, void *userData)
+@@ -1958,9 +1956,9 @@
+            curbuf = savebuf;
+            raise_vim_exn(_("cannot delete line"));
+        }
+-       deleted_lines_mark((linenr_T)n, 1L);
+        if (buf->buf == curwin->w_buffer)
+            mz_fix_cursor(n, n + 1, -1);
++       deleted_lines_mark((linenr_T)n, 1L);
+ 
+        curbuf = savebuf;
+ 
+@@ -2065,9 +2063,9 @@
+                    curbuf = savebuf;
+                    raise_vim_exn(_("cannot delete line"));
+                }
+-           deleted_lines_mark((linenr_T)lo, (long)old_len);
+            if (buf->buf == curwin->w_buffer)
+                mz_fix_cursor(lo, hi, -old_len);
++           deleted_lines_mark((linenr_T)lo, (long)old_len);
+        }
+ 
+        curbuf = savebuf;
 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-06-05 14:18:24.000000000 -0700
++++ vim72/src/if_perl.xs        2009-07-19 15:18:52.000000000 -0700
 @@ -136,6 +136,9 @@
  #  define Perl_newXS_flags dll_Perl_newXS_flags
@@ -12646 +13845 @@
      perl_interp = perl_alloc();
      perl_construct(perl_interp);
+@@ -715,9 +720,11 @@
+ #ifdef HAVE_SANDBOX
+     if (sandbox)
+     {
++# ifndef MAKE_TEST  /* avoid a warning for unreachable code */
+        if ((safe = perl_get_sv( "VIM::safe", FALSE )) == NULL || !SvTRUE(safe))
+            EMSG(_("E299: Perl evaluation forbidden in sandbox without the Safe module"));
+        else
++# endif
+        {
+            PUSHMARK(SP);
+            XPUSHs(safe);
+@@ -1228,9 +1235,8 @@
+                    if (u_savedel(lnum, 1) == OK)
+                    {
+                        ml_delete(lnum, 0);
++                       check_cursor();
+                        deleted_lines_mark(lnum, 1L);
+-                       if (aco.save_buf == curbuf)
+-                           check_cursor();
+                    }
+ 
+                    /* restore curwin/curbuf and a few other things */
 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-06-05 14:25:31.000000000 -0700
++++ vim72/src/if_python.c       2009-07-19 15:18:39.000000000 -0700
 @@ -531,6 +531,12 @@
         if (PythonMod_Init())
@@ -12836 +14058 @@
      /* Fixups... */
      BufferType.ob_type = &PyType_Type;
+@@ -2489,9 +2497,9 @@
+            PyErr_SetVim(_("cannot delete line"));
+        else
+        {
+-           deleted_lines_mark((linenr_T)n, 1L);
+            if (buf == curwin->w_buffer)
+                py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1);
++           deleted_lines_mark((linenr_T)n, 1L);
+        }
+ 
+        curbuf = savebuf;
+@@ -2588,10 +2596,9 @@
+                    break;
+                }
+            }
+-           deleted_lines_mark((linenr_T)lo, (long)i);
+-
+            if (buf == curwin->w_buffer)
+                py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n);
++           deleted_lines_mark((linenr_T)lo, (long)i);
+        }
+ 
+        curbuf = savebuf;
 diff -Naur vim72.orig/src/if_ruby.c vim72/src/if_ruby.c
 --- vim72.orig/src/if_ruby.c    2007-09-10 01:40:38.000000000 -0700
-+++ vim72/src/if_ruby.c 2009-06-05 14:25:34.000000000 -0700
++++ vim72/src/if_ruby.c 2009-07-19 15:16:49.000000000 -0700
 @@ -492,7 +492,7 @@
      }
@@ -12930 +14175 @@
 diff -Naur vim72.orig/src/if_tcl.c vim72/src/if_tcl.c
 --- vim72.orig/src/if_tcl.c     2007-05-07 12:50:14.000000000 -0700
-+++ vim72/src/if_tcl.c  2009-06-05 14:25:41.000000000 -0700
++++ vim72/src/if_tcl.c  2009-07-19 15:16:54.000000000 -0700
 @@ -161,7 +161,7 @@
  # endif
@@ -13145 +14390 @@
 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-06-05 14:25:02.000000000 -0700
++++ vim72/src/if_xcmdsrv.c      2009-07-19 15:16:23.000000000 -0700
 @@ -682,7 +682,7 @@
       * Scan all of the names out of the property.
@@ -13261 +14506 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/macros.h  2009-07-19 15:16:33.000000000 -0700
 @@ -127,15 +127,31 @@
  #ifdef FEAT_LANGMAP
@@ -13310 +14555 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/main.c    2009-07-19 15:16:33.000000000 -0700
 @@ -645,11 +645,12 @@
  
@@ -13402 +14647 @@
 diff -Naur vim72.orig/src/Makefile vim72/src/Makefile
 --- vim72.orig/src/Makefile     2008-08-09 07:50:04.000000000 -0700
-+++ vim72/src/Makefile  2009-06-05 14:25:34.000000000 -0700
++++ vim72/src/Makefile  2009-07-19 15:16:49.000000000 -0700
 @@ -105,8 +105,8 @@
  # 4. "make test"  {{{1
@@ -13516 +14761 @@
 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-06-05 14:25:02.000000000 -0700
++++ vim72/src/mark.c    2009-07-19 15:16:23.000000000 -0700
 @@ -884,10 +884,9 @@
  /*
@@ -13637 +14882 @@
 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-06-05 14:25:15.000000000 -0700
-@@ -717,7 +717,7 @@
++++ vim72/src/mbyte.c   2009-07-19 15:17:33.000000000 -0700
+@@ -127,7 +127,10 @@
+ static int dbcs_char2len __ARGS((int c));
+ static int dbcs_char2bytes __ARGS((int c, char_u *buf));
+ static int dbcs_ptr2len __ARGS((char_u *p));
++static int dbcs_ptr2len_len __ARGS((char_u *p, int size));
++static int utf_ptr2cells_len __ARGS((char_u *p, int size));
+ static int dbcs_char2cells __ARGS((int c));
++static int dbcs_ptr2cells_len __ARGS((char_u *p, int size));
+ static int dbcs_ptr2char __ARGS((char_u *p));
+ 
+ /* Lookup table to quickly get the length in bytes of a UTF-8 character from
+@@ -606,9 +609,11 @@
+     if (enc_utf8)
+     {
+        mb_ptr2len = utfc_ptr2len;
++       mb_ptr2len_len = utfc_ptr2len_len;
+        mb_char2len = utf_char2len;
+        mb_char2bytes = utf_char2bytes;
+        mb_ptr2cells = utf_ptr2cells;
++       mb_ptr2cells_len = utf_ptr2cells_len;
+        mb_char2cells = utf_char2cells;
+        mb_off2cells = utf_off2cells;
+        mb_ptr2char = utf_ptr2char;
+@@ -617,9 +622,11 @@
+     else if (enc_dbcs != 0)
+     {
+        mb_ptr2len = dbcs_ptr2len;
++       mb_ptr2len_len = dbcs_ptr2len_len;
+        mb_char2len = dbcs_char2len;
+        mb_char2bytes = dbcs_char2bytes;
+        mb_ptr2cells = dbcs_ptr2cells;
++       mb_ptr2cells_len = dbcs_ptr2cells_len;
+        mb_char2cells = dbcs_char2cells;
+        mb_off2cells = dbcs_off2cells;
+        mb_ptr2char = dbcs_ptr2char;
+@@ -628,9 +635,11 @@
+     else
+     {
+        mb_ptr2len = latin_ptr2len;
++       mb_ptr2len_len = latin_ptr2len_len;
+        mb_char2len = latin_char2len;
+        mb_char2bytes = latin_char2bytes;
+        mb_ptr2cells = latin_ptr2cells;
++       mb_ptr2cells_len = latin_ptr2cells_len;
+        mb_char2cells = latin_char2cells;
+        mb_off2cells = latin_off2cells;
+        mb_ptr2char = latin_ptr2char;
+@@ -717,7 +726,7 @@
                      * where mblen() returns 0 for invalid character.
                      * Therefore, following condition includes 0.
@@ -13647 +14939 @@
                         n = 2;
                     else
-@@ -1015,10 +1015,9 @@
+@@ -1015,10 +1024,9 @@
   * Return length in bytes of character "c".
   * Returns 1 for a single-byte character.
@@ -13659 +14951 @@
      return 1;
  }
-@@ -1248,10 +1247,9 @@
+@@ -1070,7 +1078,6 @@
+  * Get byte length of character at "*p" but stop at a NUL.
+  * For UTF-8 this includes following composing characters.
+  * Returns 0 when *p is NUL.
+- *
+  */
+     int
+ latin_ptr2len(p)
+@@ -1092,6 +1099,40 @@
+     return len;
+ }
+ 
++/*
++ * mb_ptr2len_len() function pointer.
++ * Like mb_ptr2len(), but limit to read "size" bytes.
++ * Returns 0 for an empty string.
++ * Returns 1 for an illegal char or an incomplete byte sequence.
++ */
++    int
++latin_ptr2len_len(p, size)
++    char_u     *p;
++    int                size;
++{
++    if (size < 1 || *p == NUL)
++       return 0;
++    return 1;
++}
++
++    static int
++dbcs_ptr2len_len(p, size)
++    char_u     *p;
++    int                size;
++{
++    int                len;
++
++    if (size < 1 || *p == NUL)
++       return 0;
++    if (size == 1)
++       return 1;
++    /* Check that second byte is not missing. */
++    len = MB_BYTE2LEN(*p);
++    if (len == 2 && p[1] == NUL)
++       len = 1;
++    return len;
++}
++
+ struct interval
+ {
+     unsigned short first;
+@@ -1248,10 +1289,9 @@
   * Return the number of display cells character at "*p" occupies.
   * This doesn't take care of unprintable characters, use ptr2cells() for that.
@@ -13671 +15012 @@
      return 1;
  }
-@@ -1293,10 +1291,9 @@
+@@ -1289,14 +1329,62 @@
+ }
+ 
+ /*
++ * mb_ptr2cells_len() function pointer.
++ * Like mb_ptr2cells(), but limit string length to "size".
++ * For an empty string or truncated character returns 1.
++ */
++    int
++latin_ptr2cells_len(p, size)
++    char_u     *p UNUSED;
++    int                size UNUSED;
++{
++    return 1;
++}
++
++    static int
++utf_ptr2cells_len(p, size)
++    char_u     *p;
++    int                size;
++{
++    int                c;
++
++    /* Need to convert to a wide character. */
++    if (size > 0 && *p >= 0x80)
++    {
++       if (utf_ptr2len_len(p, size) < utf8len_tab[*p])
++           return 1;
++       c = utf_ptr2char(p);
++       /* An illegal byte is displayed as <xx>. */
++       if (utf_ptr2len(p) == 1 || c == NUL)
++           return 4;
++       /* If the char is ASCII it must be an overlong sequence. */
++       if (c < 0x80)
++           return char2cells(c);
++       return utf_char2cells(c);
++    }
++    return 1;
++}
++
++    static int
++dbcs_ptr2cells_len(p, size)
++    char_u     *p;
++    int                size;
++{
++    /* Number of cells is equal to number of bytes, except for euc-jp when
++     * the first byte is 0x8e. */
++    if (size <= 1 || (enc_dbcs == DBCS_JPNU && *p == 0x8e))
++       return 1;
++    return MB_BYTE2LEN(*p);
++}
++
++/*
+  * mb_char2cells() function pointer.
   * Return the number of display cells character "c" occupies.
   * Only takes care of multi-byte chars, not "^C" and such.
@@ -13683 +15077 @@
      return 1;
  }
-@@ -1318,11 +1315,10 @@
+@@ -1318,11 +1406,10 @@
   * Return number of display cells for char at ScreenLines[off].
   * We make sure that the offset used is less than "max_off".
@@ -13697 +15091 @@
      return 1;
  }
-@@ -2419,11 +2415,10 @@
+@@ -1720,6 +1807,7 @@
+ /*
+  * Return the number of bytes the UTF-8 encoding of the character at "p[size]"
+  * takes.  This includes following composing characters.
++ * Returns 0 for an empty string.
+  * Returns 1 for an illegal char or an incomplete byte sequence.
+  */
+     int
+@@ -1732,7 +1820,7 @@
+     int                prevlen;
+ #endif
+ 
+-    if (*p == NUL)
++    if (size < 1 || *p == NUL)
+        return 0;
+     if (p[0] < 0x80 && (size == 1 || p[1] < 0x80)) /* be quick for ASCII */
+        return 1;
+@@ -2419,11 +2507,10 @@
   * Return offset from "p" to the first byte of the character it points into.
   * Returns 0 when already at the first byte of a character.
@@ -13711 +15122 @@
      return 0;
  }
-@@ -2540,7 +2535,6 @@
+@@ -2540,7 +2627,6 @@
      return (int)(p - q);
  }
@@ -13719 +15130 @@
   * Copy a character from "*fp" to "*tp" and advance the pointers.
   */
-@@ -2555,7 +2549,6 @@
+@@ -2555,7 +2641,6 @@
      *tp += l;
      *fp += l;
@@ -13727 +15138 @@
  /*
   * Return the offset from "p" to the first byte of a character.  When "p" is
-@@ -3133,7 +3126,7 @@
+@@ -3133,7 +3218,7 @@
         else
             s = p + 1;
@@ -13736 +15147 @@
         if (s[i] == '_' || s[i] == '-')
             buf[i] = '-';
-@@ -3584,9 +3577,10 @@
+@@ -3180,7 +3265,7 @@
+ 
+ # if defined(USE_ICONV) || defined(PROTO)
+ 
+-static char_u *iconv_string __ARGS((vimconv_T *vcp, char_u *str, int slen, int *unconvlenp));
++static char_u *iconv_string __ARGS((vimconv_T *vcp, char_u *str, int slen, int *unconvlenp, int *resultlenp));
+ 
+ /*
+  * Call iconv_open() with a check if iconv() works properly (there are broken
+@@ -3241,13 +3326,15 @@
+  * If "unconvlenp" is not NULL handle the string ending in an incomplete
+  * sequence and set "*unconvlenp" to the length of it.
+  * Returns the converted string in allocated memory.  NULL for an error.
++ * If resultlenp is not NULL, sets it to the result length in bytes.
+  */
+     static char_u *
+-iconv_string(vcp, str, slen, unconvlenp)
++iconv_string(vcp, str, slen, unconvlenp, resultlenp)
+     vimconv_T  *vcp;
+     char_u     *str;
+     int                slen;
+     int                *unconvlenp;
++    int                *resultlenp;
+ {
+     const char *from;
+     size_t     fromlen;
+@@ -3333,6 +3420,9 @@
+        /* Not enough room or skipping illegal sequence. */
+        done = to - (char *)result;
+     }
++
++    if (resultlenp != NULL)
++       *resultlenp = (int)(to - (char *)result);
+     return result;
+ }
+ 
+@@ -3584,9 +3674,10 @@
   * Callback invoked when the user finished preediting.
   * Put the final string into the input buffer.
@@ -13749 +15196 @@
      int        slen = (int)STRLEN(str);
      int        add_to_input = TRUE;
-@@ -3672,9 +3666,8 @@
+@@ -3672,9 +3763,8 @@
  /*
   * Callback invoked after start to the preedit.
@@ -13760 +15207 @@
  #ifdef XIM_DEBUG
      xim_log("im_preedit_start_cb()\n");
-@@ -3689,9 +3682,8 @@
+@@ -3689,9 +3779,8 @@
  /*
   * Callback invoked after end to the preedit.
@@ -13771 +15218 @@
  #ifdef XIM_DEBUG
      xim_log("im_preedit_end_cb()\n");
-@@ -3750,9 +3742,8 @@
+@@ -3750,9 +3839,8 @@
   * remaining input from within the "retrieve_surrounding" signal handler, this
   * might not be necessary.  Gotta ask on vim-dev for opinions.
@@ -13782 +15229 @@
      char    *preedit_string = NULL;
      int            cursor_index    = 0;
-@@ -4618,11 +4609,10 @@
+@@ -4618,11 +4706,10 @@
      }
  }
@@ -13796 +15243 @@
      xim_set_preedit();
  }
-@@ -4929,12 +4919,11 @@
+@@ -4929,12 +5016,11 @@
  static void xim_instantiate_cb __ARGS((Display *display, XPointer client_data, XPointer        call_data));
  static void xim_destroy_cb __ARGS((XIM im, XPointer client_data, XPointer call_data));
@@ -13811 +15258 @@
      Window     x11_window;
      Display    *x11_display;
-@@ -4954,12 +4943,11 @@
+@@ -4954,12 +5040,11 @@
                                          xim_instantiate_cb, NULL);
  }
@@ -13827 +15274 @@
      Window     x11_window;
      Display    *x11_display;
-@@ -5278,9 +5266,10 @@
+@@ -5278,9 +5363,10 @@
      }
  }
@@ -13840 +15287 @@
  #ifdef XIM_DEBUG
      xim_log("xim_decide_input_style()\n");
-@@ -5312,9 +5301,10 @@
+@@ -5312,9 +5398,10 @@
  static GSList *key_press_event_queue = NULL;
  static gboolean processing_queued_event = FALSE;
@@ -13853 +15300 @@
      XIMPreeditDrawCallbackStruct *draw_data;
      XIMText    *text;
-@@ -5386,7 +5376,7 @@
+@@ -5386,7 +5473,7 @@
                         draw_feedback = (char *)alloc(draw_data->chg_first
                                                               + text->length);
@@ -13862 +15309 @@
                     if (draw_feedback != NULL)
                     {
-@@ -5453,18 +5443,20 @@
+@@ -5453,18 +5540,20 @@
      return -1;
  }
@@ -13887 +15334 @@
  #ifdef XIM_DEBUG
      xim_log("preedit_done_cbproc()\n");
-@@ -5503,9 +5495,8 @@
+@@ -5503,9 +5592,8 @@
      }
  }
@@ -13898 +15345 @@
  #ifdef XIM_DEBUG
      xim_log("xim_queue_key_press_event()\n");
-@@ -5521,9 +5512,8 @@
+@@ -5521,9 +5609,8 @@
      return TRUE;
  }
@@ -13909 +15356 @@
      XIC xxic;
      XVaNestedList preedit_attr;
-@@ -5548,9 +5538,8 @@
+@@ -5548,9 +5635,8 @@
      XFree(preedit_attr);
  }
@@ -13920 +15367 @@
  #ifdef USE_X11R6_XIM
      /* don't change the input context when we call reset */
+@@ -5756,8 +5842,25 @@
+     char_u     *from;
+     char_u     *to;
+ {
++    return convert_setup_ext(vcp, from, TRUE, to, TRUE);
++}
++
++/*
++ * As convert_setup(), but only when from_unicode_is_utf8 is TRUE will all
++ * "from" unicode charsets be considered utf-8.  Same for "to".
++ */
++    int
++convert_setup_ext(vcp, from, from_unicode_is_utf8, to, to_unicode_is_utf8)
++    vimconv_T  *vcp;
++    char_u     *from;
++    int                from_unicode_is_utf8;
++    char_u     *to;
++    int                to_unicode_is_utf8;
++{
+     int                from_prop;
+     int                to_prop;
++    int                from_is_utf8;
++    int                to_is_utf8;
+ 
+     /* Reset to no conversion. */
+ # ifdef USE_ICONV
+@@ -5775,37 +5878,46 @@
+ 
+     from_prop = enc_canon_props(from);
+     to_prop = enc_canon_props(to);
+-    if ((from_prop & ENC_LATIN1) && (to_prop & ENC_UNICODE))
++    if (from_unicode_is_utf8)
++       from_is_utf8 = from_prop & ENC_UNICODE;
++    else
++       from_is_utf8 = from_prop == ENC_UNICODE;
++    if (to_unicode_is_utf8)
++       to_is_utf8 = to_prop & ENC_UNICODE;
++    else
++       to_is_utf8 = to_prop == ENC_UNICODE;
++
++    if ((from_prop & ENC_LATIN1) && to_is_utf8)
+     {
+        /* Internal latin1 -> utf-8 conversion. */
+        vcp->vc_type = CONV_TO_UTF8;
+        vcp->vc_factor = 2;     /* up to twice as long */
+     }
+-    else if ((from_prop & ENC_LATIN9) && (to_prop & ENC_UNICODE))
++    else if ((from_prop & ENC_LATIN9) && to_is_utf8)
+     {
+        /* Internal latin9 -> utf-8 conversion. */
+        vcp->vc_type = CONV_9_TO_UTF8;
+        vcp->vc_factor = 3;     /* up to three as long (euro sign) */
+     }
+-    else if ((from_prop & ENC_UNICODE) && (to_prop & ENC_LATIN1))
++    else if (from_is_utf8 && (to_prop & ENC_LATIN1))
+     {
+        /* Internal utf-8 -> latin1 conversion. */
+        vcp->vc_type = CONV_TO_LATIN1;
+     }
+-    else if ((from_prop & ENC_UNICODE) && (to_prop & ENC_LATIN9))
++    else if (from_is_utf8 && (to_prop & ENC_LATIN9))
+     {
+        /* Internal utf-8 -> latin9 conversion. */
+        vcp->vc_type = CONV_TO_LATIN9;
+     }
+ #ifdef WIN3264
+     /* Win32-specific codepage <-> codepage conversion without iconv. */
+-    else if (((from_prop & ENC_UNICODE) || encname2codepage(from) > 0)
+-           && ((to_prop & ENC_UNICODE) || encname2codepage(to) > 0))
++    else if ((from_is_utf8 || encname2codepage(from) > 0)
++           && (to_is_utf8 || encname2codepage(to) > 0))
+     {
+        vcp->vc_type = CONV_CODEPAGE;
+        vcp->vc_factor = 2;     /* up to twice as long */
+-       vcp->vc_cpfrom = (from_prop & ENC_UNICODE) ? 0 : encname2codepage(from);
+-       vcp->vc_cpto = (to_prop & ENC_UNICODE) ? 0 : encname2codepage(to);
++       vcp->vc_cpfrom = from_is_utf8 ? 0 : encname2codepage(from);
++       vcp->vc_cpto = to_is_utf8 ? 0 : encname2codepage(to);
+     }
+ #endif
+ #ifdef MACOS_X
+@@ -5813,7 +5925,7 @@
+     {
+        vcp->vc_type = CONV_MAC_LATIN1;
+     }
+-    else if ((from_prop & ENC_MACROMAN) && (to_prop & ENC_UNICODE))
++    else if ((from_prop & ENC_MACROMAN) && to_is_utf8)
+     {
+        vcp->vc_type = CONV_MAC_UTF8;
+        vcp->vc_factor = 2;     /* up to twice as long */
+@@ -5822,7 +5934,7 @@
+     {
+        vcp->vc_type = CONV_LATIN1_MAC;
+     }
+-    else if ((from_prop & ENC_UNICODE) && (to_prop & ENC_MACROMAN))
++    else if (from_is_utf8 && (to_prop & ENC_MACROMAN))
+     {
+        vcp->vc_type = CONV_UTF8_MAC;
+     }
+@@ -5832,8 +5944,8 @@
+     {
+        /* Use iconv() for conversion. */
+        vcp->vc_fd = (iconv_t)my_iconv_open(
+-               (to_prop & ENC_UNICODE) ? (char_u *)"utf-8" : to,
+-               (from_prop & ENC_UNICODE) ? (char_u *)"utf-8" : from);
++               to_is_utf8 ? (char_u *)"utf-8" : to,
++               from_is_utf8 ? (char_u *)"utf-8" : from);
+        if (vcp->vc_fd != (iconv_t)-1)
+        {
+            vcp->vc_type = CONV_ICONV;
+@@ -6089,9 +6201,7 @@
+ 
+ # ifdef USE_ICONV
+        case CONV_ICONV:        /* conversion with output_conv.vc_fd */
+-           retval = iconv_string(vcp, ptr, len, unconvlenp);
+-           if (retval != NULL && lenp != NULL)
+-               *lenp = (int)STRLEN(retval);
++           retval = iconv_string(vcp, ptr, len, unconvlenp, lenp);
+            break;
+ # endif
+ # ifdef WIN3264
 diff -Naur vim72.orig/src/memline.c vim72/src/memline.c
 --- vim72.orig/src/memline.c    2008-07-13 09:19:22.000000000 -0700
-+++ vim72/src/memline.c 2009-06-05 14:23:47.000000000 -0700
++++ vim72/src/memline.c 2009-07-19 15:15:19.000000000 -0700
 @@ -1554,10 +1554,15 @@
             for (i = 0; i < num_files; ++i)
@@ -13982 +15550 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/menu.c    2009-07-19 15:16:33.000000000 -0700
 @@ -231,7 +231,7 @@
                 if (skipdigits(menu_path + 7) == p)
@@ -14059 +15627 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/message.c 2009-07-19 15:18:26.000000000 -0700
+@@ -107,7 +107,7 @@
+ }
+ 
+ #if defined(FEAT_EVAL) || defined(FEAT_X11) || defined(USE_XSMP) \
+-    || defined(PROTO)
++    || defined(FEAT_GUI_GTK) || defined(PROTO)
+ /*
+  * Like msg() but keep it silent when 'verbosefile' is set.
+  */
 @@ -818,10 +818,9 @@
  /*
@@ -14371 +15948 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/misc1.c   2009-07-19 15:19:00.000000000 -0700
 @@ -2188,12 +2188,11 @@
   *
@@ -14386 +15963 @@
      char_u     *oldp, *newp;
      colnr_T    oldlen;
-@@ -2717,6 +2716,9 @@
+@@ -2346,12 +2345,13 @@
+     int                undo;           /* if TRUE, prepare for undo */
+ {
+     long       n;
++    linenr_T   first = curwin->w_cursor.lnum;
+ 
+     if (nlines <= 0)
+        return;
+ 
+     /* save the deleted lines for undo */
+-    if (undo && u_savedel(curwin->w_cursor.lnum, nlines) == FAIL)
++    if (undo && u_savedel(first, nlines) == FAIL)
+        return;
+ 
+     for (n = 0; n < nlines; )
+@@ -2359,18 +2359,21 @@
+        if (curbuf->b_ml.ml_flags & ML_EMPTY)       /* nothing to delete */
+            break;
+ 
+-       ml_delete(curwin->w_cursor.lnum, TRUE);
++       ml_delete(first, TRUE);
+        ++n;
+ 
+        /* If we delete the last line in the file, stop */
+-       if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count)
++       if (first > curbuf->b_ml.ml_line_count)
+            break;
+     }
+-    /* adjust marks, mark the buffer as changed and prepare for displaying */
+-    deleted_lines_mark(curwin->w_cursor.lnum, n);
+ 
++    /* Correct the cursor position before calling deleted_lines_mark(), it may
++     * trigger a callback to display the cursor. */
+     curwin->w_cursor.col = 0;
+     check_cursor_lnum();
++
++    /* adjust marks, mark the buffer as changed and prepare for displaying */
++    deleted_lines_mark(first, n);
+ }
+ 
+     int
+@@ -2622,6 +2625,8 @@
+ 
+ /*
+  * Like deleted_lines(), but adjust marks first.
++ * Make sure the cursor is on a valid line before calling, a GUI callback may
++ * be triggered to display the cursor.
+  */
+     void
+ deleted_lines_mark(lnum, count)
+@@ -2717,6 +2722,9 @@
      long       xtra;
  {
@@ -14396 +16023 @@
  #ifdef FEAT_JUMPLIST
      int                cols;
-@@ -2769,7 +2771,7 @@
+@@ -2769,7 +2777,7 @@
                     curbuf->b_changelistlen = JUMPLISTSIZE - 1;
                     mch_memmove(curbuf->b_changelist, curbuf->b_changelist + 1,
@@ -14405 +16032 @@
                         /* Correct position in changelist for other windows on
                          * this buffer. */
-@@ -2777,7 +2779,7 @@
+@@ -2777,7 +2785,7 @@
                             --wp->w_changelistidx;
                     }
@@ -14414 +16041 @@
                     /* For other windows, if the position in the changelist is
                      * at the end it stays at the end. */
-@@ -2796,7 +2798,7 @@
+@@ -2796,7 +2804,7 @@
  #endif
      }
@@ -14423 +16050 @@
         if (wp->w_buffer == curbuf)
         {
-@@ -2955,6 +2957,8 @@
+@@ -2955,6 +2963,8 @@
      int            col;                /* column for message; non-zero when in insert
                                    mode and 'showmode' is on */
@@ -14432 +16059 @@
             && curbufIsChanged() == 0
  #ifdef FEAT_AUTOCMD
-@@ -2977,8 +2981,10 @@
+@@ -2977,8 +2987,10 @@
         if (msg_row == Rows - 1)
             msg_col = col;
@@ -14445 +16072 @@
         (void)msg_end();
         if (msg_silent == 0 && !silent_mode)
-@@ -3245,9 +3251,9 @@
+@@ -3245,9 +3257,9 @@
  
      /* When using ":silent" assume that <CR> was entered. */
@@ -14457 +16084 @@
      /* Set the state such that text can be selected/copied/pasted and we still
       * get mouse events. */
-@@ -4141,10 +4147,9 @@
+@@ -4141,10 +4153,9 @@
  /*
   * Function given to ExpandGeneric() to obtain an environment variable name.
@@ -14469 +16096 @@
  {
  # if defined(AMIGA) || defined(__MRC__) || defined(__SC__)
-@@ -4736,9 +4741,9 @@
+@@ -4736,9 +4747,9 @@
          * If it is then restrict the search to below this line and try again.
          */
@@ -14481 +16108 @@
         cur_maxcomment = curwin->w_cursor.lnum - pos->lnum - 1;
         if (cur_maxcomment <= 0)
-@@ -6269,7 +6274,7 @@
+@@ -6269,7 +6280,7 @@
       * check for that.
       */
@@ -14490 +16117 @@
         linecopy[curwin->w_cursor.col] = NUL;
  
+@@ -8522,11 +8533,25 @@
+     for (setsuf = p_su; *setsuf; )
+     {
+        setsuflen = copy_option_part(&setsuf, suf_buf, MAXSUFLEN, ".,");
+-       if (fnamelen >= setsuflen
+-               && fnamencmp(suf_buf, fname + fnamelen - setsuflen,
+-                                             (size_t)setsuflen) == 0)
+-           break;
+-       setsuflen = 0;
++       if (setsuflen == 0)
++       {
++           char_u *tail = gettail(fname);
++
++           /* empty entry: match name without a '.' */
++           if (vim_strchr(tail, '.') == NULL)
++           {
++               setsuflen = 1;
++               break;
++           }
++       }
++       else
++       {
++           if (fnamelen >= setsuflen
++                   && fnamencmp(suf_buf, fname + fnamelen - setsuflen,
++                                                 (size_t)setsuflen) == 0)
++               break;
++           setsuflen = 0;
++       }
+     }
+     return (setsuflen != 0);
+ }
+@@ -9188,7 +9213,7 @@
+                else if (vim_strpbrk(p, (char_u *)"$~") != NULL)
+                {
+                    vim_free(p);
+-                   ga_clear(&ga);
++                   ga_clear_strings(&ga);
+                    i = mch_expand_wildcards(num_pat, pat, num_file, file,
+                                                                       flags);
+                    recursive = FALSE;
 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-06-05 14:25:06.000000000 -0700
++++ vim72/src/misc2.c   2009-07-19 15:16:25.000000000 -0700
 @@ -496,7 +496,8 @@
  {
@@ -14698 +16365 @@
 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-06-05 14:24:51.000000000 -0700
++++ vim72/src/move.c    2009-07-19 15:16:14.000000000 -0700
 @@ -280,18 +280,20 @@
  
@@ -14774 +16441 @@
 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-06-05 14:21:41.000000000 -0700
++++ vim72/src/nbdebug.c 2009-07-19 15:13:36.000000000 -0700
 @@ -33,7 +33,6 @@
  u_int           nb_dlevel = 0;         /* nb_debug verbosity level */
@@ -14835 +16502 @@
 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-06-05 14:21:41.000000000 -0700
++++ vim72/src/nbdebug.h 2009-07-19 15:13:36.000000000 -0700
 @@ -43,8 +43,6 @@
  
@@ -14867 +16534 @@
 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-06-05 14:25:22.000000000 -0700
-@@ -700,7 +700,6 @@
++++ vim72/src/netbeans.c        2009-07-19 15:18:05.000000000 -0700
+@@ -32,6 +32,7 @@
+ /* WinSock API is separated from C API, thus we can't use read(), write(),
+  * errno... */
+ # define sock_errno WSAGetLastError()
++# undef ECONNREFUSED
+ # define ECONNREFUSED WSAECONNREFUSED
+ # ifdef EINTR
+ #  undef EINTR
+@@ -700,7 +701,6 @@
  /*
   * Read and process a command from netbeans.
@@ -14876 +16551 @@
  /* Use this one when generating prototypes, the others are static. */
      void
-@@ -708,12 +707,15 @@
+@@ -708,12 +708,15 @@
  #else
  # ifdef FEAT_GUI_MOTIF
@@ -14895 +16570 @@
  #endif
  {
-@@ -1043,7 +1045,7 @@
+@@ -1043,7 +1046,7 @@
         nbdebug(("EVT: %s", buf));
  /*     nb_send(buf, "netbeans_end");    avoid "write failed" messages */
@@ -14904 +16579 @@
  }
  
-@@ -1582,7 +1584,9 @@
+@@ -1582,7 +1585,9 @@
                             buf_delsign(buf->bufp, id);
                         }
@@ -14914 +16589 @@
  
                     nbdebug(("    Deleting lines %d through %d\n", del_from_lnum, del_to_lnum));
-@@ -1921,7 +1925,7 @@
+@@ -1921,7 +1926,7 @@
             vim_free(path);
             if (bufp == NULL)
@@ -14923 +16598 @@
                 return FAIL;
             }
-@@ -2141,7 +2145,9 @@
+@@ -2141,7 +2146,9 @@
  #endif
             }
@@ -14933 +16608 @@
             /* gui_update_cursor(TRUE, FALSE); */
             /* update_curbuf(NOT_VALID); */
-@@ -2277,9 +2283,6 @@
+@@ -2277,9 +2284,6 @@
             int serNum;
             int localTypeNum;
@@ -14943 +16618 @@
  
             if (buf == NULL || buf->bufp == NULL)
-@@ -2303,13 +2306,10 @@
+@@ -2303,13 +2307,10 @@
             pos = get_off_or_lnum(buf->bufp, &args);
  
@@ -14959 +16634 @@
                 nbdebug(("    partial line annotation -- Not Yet Implemented!\n"));
             }
-@@ -2321,7 +2321,7 @@
+@@ -2321,7 +2322,7 @@
             }
             if (pos)
@@ -14968 +16643 @@
                 if (typeNum == curPCtype)
                     coloncmd(":sign jump %d buffer=%d", serNum,
-@@ -2425,7 +2425,7 @@
+@@ -2425,7 +2426,7 @@
                                 GUARDED) == 0)
                             {
@@ -14977 +16652 @@
                                      buf->bufp->b_fnum);
                             }
-@@ -2747,11 +2747,10 @@
+@@ -2582,7 +2583,7 @@
+     va_list ap;
+ 
+     va_start(ap, cmd);
+-    vsprintf(buf, cmd, ap);
++    vim_vsnprintf(buf, sizeof(buf), cmd, ap, NULL);
+     va_end(ap);
+ 
+     nbdebug(("    COLONCMD %s\n", buf));
+@@ -2747,11 +2748,10 @@
   * cursor and sends it to the debugger for evaluation.  The debugger should
   * respond with a showBalloon command when there is a useful result.
@@ -14990 +16674 @@
      win_T      *wp;
      char_u     *text;
-@@ -2924,44 +2923,26 @@
+@@ -2924,44 +2924,26 @@
  }
  
@@ -15041 +16725 @@
      if (nbbuf != NULL)
         nbbuf->bufp = NULL;
-@@ -3082,9 +3063,8 @@
+@@ -3082,9 +3064,8 @@
  /*
   * Send netbeans an unmodufied command.
@@ -15052 +16736 @@
  #if 0
      char_u     buf[128];
-@@ -3391,13 +3371,12 @@
+@@ -3391,13 +3372,12 @@
   * buf->signmapused[]  maps buffer-local annotation IDs to an index in
   *                     globalsignmap[].
@@ -15069 +16753 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/normal.c  2009-07-19 15:16:33.000000000 -0700
 @@ -183,6 +183,8 @@
  static void    nv_cursorhold __ARGS((cmdarg_T *cap));
@@ -15495 +17179 @@
 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-06-05 14:25:51.000000000 -0700
++++ vim72/src/ops.c     2009-07-19 15:18:26.000000000 -0700
 @@ -72,11 +72,11 @@
   */
@@ -15805 +17489 @@
                     (int)y_regs[i].y_width
  #else
-@@ -6258,11 +6299,20 @@
+@@ -5550,6 +5591,29 @@
+     if (dpy != NULL && str != NULL && motion_type >= 0
+                                               && len < 1024*1024 && len > 0)
+     {
++#ifdef FEAT_MBYTE
++       /* The CUT_BUFFER0 is supposed to always contain latin1.  Convert from
++        * 'enc' when it is a multi-byte encoding.  When 'enc' is an 8-bit
++        * encoding conversion usually doesn't work, so keep the text as-is.
++        */
++       if (has_mbyte)
++       {
++           char_u      *conv_str = str;
++           vimconv_T   vc;
++
++           vc.vc_type = CONV_NONE;
++           if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
++           {
++               conv_str = string_convert(&vc, str, (int*)&len);
++               if (conv_str != NULL)
++               {
++                   vim_free(str);
++                   str = conv_str;
++               }
++               convert_setup(&vc, NULL, NULL);
++           }
++       }
++#endif
+        XStoreBuffer(dpy, (char *)str, (int)len, 0);
+        XFlush(dpy);
+     }
+@@ -6258,11 +6322,20 @@
  
             if (VIsual_mode == Ctrl_V)
@@ -15826 +17540 @@
                     oparg.end_vcol = MAXCOL;
                 /* Swap the start, end vcol if needed */
-@@ -6366,7 +6416,7 @@
+@@ -6366,7 +6439,7 @@
             {
                 getvcols(curwin, &min_pos, &max_pos, &min_pos.col,
@@ -15835 +17549 @@
             }
             else
-@@ -6374,13 +6424,15 @@
+@@ -6374,13 +6447,15 @@
  
             if (char_count_cursor == byte_count_cursor
@@ -15853 +17567 @@
                         (long)curbuf->b_ml.ml_line_count,
                         word_count_cursor, word_count,
-@@ -6392,20 +6444,22 @@
+@@ -6392,20 +6467,22 @@
         {
             p = ml_get_curline();
@@ -15882 +17596 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/option.c  2009-07-19 15:17:52.000000000 -0700
 @@ -387,6 +387,9 @@
      char_u     *def_val[2];    /* default values for variable (vi and vim) */
@@ -18327 +20041 @@
  
  #define PARAM_COUNT (sizeof(options) / sizeof(struct vimoption))
+@@ -3984,7 +4006,7 @@
+        else
+        {
+            prefix = 1;
+-           if (STRNCMP(arg, "no", 2) == 0)
++           if (STRNCMP(arg, "no", 2) == 0 && STRNCMP(arg, "novice", 6) != 0)
+            {
+                prefix = 0;
+                arg += 2;
 @@ -4119,11 +4141,23 @@
                                            && options[opt_idx].var == VAR_WIN)
@@ -18560 +20283 @@
      return errmsg;
  }
-@@ -7105,22 +7197,28 @@
+@@ -6932,6 +7024,7 @@
+     int                new_unnamed = FALSE;
+     int                new_autoselect = FALSE;
+     int                new_autoselectml = FALSE;
++    int                new_html = FALSE;
+     regprog_T  *new_exclude_prog = NULL;
+     char_u     *errmsg = NULL;
+     char_u     *p;
+@@ -6955,6 +7048,11 @@
+            new_autoselectml = TRUE;
+            p += 12;
+        }
++       else if (STRNCMP(p, "html", 4) == 0 && (p[4] == ',' || p[4] == NUL))
++       {
++           new_html = TRUE;
++           p += 4;
++       }
+        else if (STRNCMP(p, "exclude:", 8) == 0 && new_exclude_prog == NULL)
+        {
+            p += 8;
+@@ -6976,6 +7074,7 @@
+        clip_unnamed = new_unnamed;
+        clip_autoselect = new_autoselect;
+        clip_autoselectml = new_autoselectml;
++       clip_html = new_html;
+        vim_free(clip_exclude_prog);
+        clip_exclude_prog = new_exclude_prog;
+     }
+@@ -7105,22 +7204,28 @@
             curbuf->b_did_warn = FALSE;
  
@@ -18596 +20347 @@
  
      /* when 'bin' is set also set some other options */
-@@ -7128,7 +7226,7 @@
+@@ -7128,7 +7233,7 @@
      {
         set_options_bin(old_value, curbuf->b_p_bin, opt_flags);
@@ -18605 +20356 @@
      }
  
-@@ -7279,7 +7377,7 @@
+@@ -7279,7 +7384,7 @@
         if (!value)
             save_file_ff(curbuf);       /* Buffer is unchanged */
@@ -18614 +20365 @@
  #ifdef FEAT_AUTOCMD
         modified_was_set = value;
-@@ -7486,9 +7584,13 @@
+@@ -7486,9 +7591,13 @@
              * set. */
             if (STRCMP(p_enc, "utf-8") != 0)
@@ -18630 +20381 @@
  
  # ifdef FEAT_MBYTE
-@@ -7714,7 +7816,7 @@
+@@ -7714,7 +7823,7 @@
         newFoldLevel();
      }
@@ -18639 +20390 @@
      {
         foldUpdateAll(curwin);
-@@ -7974,6 +8076,11 @@
+@@ -7974,6 +8083,11 @@
         else /* curwin->w_p_scr > curwin->w_height */
             curwin->w_p_scr = curwin->w_height;
@@ -18651 +20402 @@
      {
         errmsg = e_positive;
-@@ -8227,13 +8334,13 @@
+@@ -8227,13 +8341,13 @@
             {
                 if (number == 0 && string != NULL)
@@ -18668 +20419 @@
                         /* There's another character after zeros or the string
                          * is empty.  In both cases, we are trying to set a
-@@ -8323,7 +8430,7 @@
+@@ -8323,7 +8437,7 @@
      {
         --arg;                      /* put arg at the '<' */
@@ -18677 +20428 @@
             key = 0;
      }
-@@ -9271,10 +9378,9 @@
+@@ -9271,10 +9385,9 @@
  /*
   * Check for NULL pointers in a winopt_T and replace them with empty_option.
@@ -18689 +20440 @@
  #ifdef FEAT_FOLDING
      check_string_option(&wop->wo_fdi);
-@@ -9296,10 +9402,9 @@
+@@ -9296,10 +9409,9 @@
  /*
   * Free the allocated memory inside a winopt_T.
@@ -18701 +20452 @@
  #ifdef FEAT_FOLDING
      clear_string_option(&wop->wo_fdi);
-@@ -9834,7 +9939,8 @@
+@@ -9645,7 +9757,7 @@
+        }
+        --p;
+     }
+-    if (STRNCMP(p, "no", 2) == 0)
++    if (STRNCMP(p, "no", 2) == 0 && STRNCMP(p, "novice", 6) != 0)
+     {
+        xp->xp_context = EXPAND_BOOL_SETTINGS;
+        p += 2;
+@@ -9834,7 +9946,8 @@
         regmatch->rm_ic = ic;
         if (xp->xp_context != EXPAND_BOOL_SETTINGS)
@@ -18711 +20471 @@
                 {
                     if (loop == 0)
-@@ -10093,25 +10199,110 @@
+@@ -10093,25 +10206,110 @@
  
  #ifdef FEAT_LANGMAP
@@ -18729 +20489 @@
 + * langmap_entry_T.  This does the same as langmap_mapchar[] for characters >=
 + * 256.
-+ */
+  */
 +# ifdef FEAT_MBYTE
 +/*
@@ -18742 +20502 @@
 +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.
@@ -18784 +20548 @@
 +    entries[0].to = 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.
++
++/*
 + * Apply 'langmap' to multi-byte character "c" and return the result.
-  */
++ */
 +    int
 +langmap_adjust_mb(c)
@@ -18831 +20591 @@
  
  /*
-@@ -10125,7 +10316,10 @@
+@@ -10125,7 +10323,10 @@
      char_u  *p2;
      int            from, to;
@@ -18843 +20603 @@
      for (p = p_langmap; p[0] != NUL; )
      {
-@@ -10175,7 +10369,13 @@
+@@ -10175,7 +10376,13 @@
                                                              transchar(from));
                 return;
@@ -18860 +20620 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/os_unix.c 2009-07-19 15:18:55.000000000 -0700
 @@ -181,7 +181,8 @@
         && defined(FEAT_TITLE) && !defined(FEAT_GUI_GTK)
@@ -18891 +20651 @@
  static int curr_tmode = TMODE_COOK;    /* contains current terminal mode */
  
-@@ -315,12 +319,15 @@
+@@ -315,12 +319,32 @@
      {-1,           "Unknown!", FALSE}
  };
  
++    int
++mch_chdir(path)
++    char *path;
++{
++    if (p_verbose >= 5)
++    {
++       verbose_enter();
++       smsg((char_u *)"chdir(%s)", path);
++       verbose_leave();
++    }
++# ifdef VMS
++    return chdir(vms_fixfilename(path));
++# else
++    return chdir(path);
++# endif
++}
++
 +/*
 + * Write s[len] to the screen.
@@ -18908 +20685 @@
         RealWaitForChar(read_cmd_fd, p_wd, NULL);
  }
-@@ -447,10 +454,9 @@
+@@ -447,10 +471,9 @@
   * Return total amount of memory available in Kbyte.
   * Doesn't change when memory has been allocated.
@@ -18920 +20697 @@
  # ifdef __EMX__
      return ulimit(3, 0L) >> 10;   /* always 32MB? */
-@@ -799,12 +805,11 @@
+@@ -799,12 +822,11 @@
  #endif
  
@@ -18934 +20711 @@
  sig_winch SIGDEFARG(sigarg)
  {
-@@ -816,7 +821,6 @@
+@@ -816,7 +838,6 @@
  #endif
  
@@ -18942 +20719 @@
  catch_sigint SIGDEFARG(sigarg)
  {
-@@ -828,7 +832,6 @@
+@@ -828,7 +849,6 @@
  #endif
  
@@ -18950 +20727 @@
  catch_sigpwr SIGDEFARG(sigarg)
  {
-@@ -848,7 +851,6 @@
+@@ -848,7 +868,6 @@
  /*
   * signal function for alarm().
@@ -18958 +20735 @@
  sig_alarm SIGDEFARG(sigarg)
  {
-@@ -1065,19 +1067,23 @@
+@@ -1065,19 +1084,23 @@
      SIGRETURN;
  }
@@ -18985 +20762 @@
  sigcont_handler SIGDEFARG(sigarg)
  {
-@@ -1115,15 +1121,28 @@
+@@ -1115,15 +1138,28 @@
      }
  # endif
@@ -19012 +20789 @@
 +     */
 +    {
-+       long wait;
-+       for (wait = 0; !sigcont_received && wait <= 3L; wait++)
++       long wait_time;
++       for (wait_time = 0; !sigcont_received && wait_time <= 3L; wait_time++)
 +           /* Loop is not entered most of the time */
-+           mch_delay(wait, FALSE);
++           mch_delay(wait_time, FALSE);
 +    }
  # endif
  
  # ifdef FEAT_TITLE
-@@ -1172,7 +1191,7 @@
+@@ -1172,7 +1208,7 @@
  #ifdef SIGTSTP
      signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL);
@@ -19029 +20806 @@
  #endif
  
-@@ -1231,7 +1250,7 @@
+@@ -1231,7 +1267,7 @@
  reset_signals()
  {
@@ -19038 +20815 @@
      signal(SIGCONT, SIG_DFL);
  #endif
-@@ -1326,11 +1345,10 @@
+@@ -1326,11 +1362,10 @@
  /*
   * Check_win checks whether we have an interactive stdout.
@@ -19052 +20829 @@
  #ifdef OS2
      /*
-@@ -1414,11 +1432,10 @@
+@@ -1414,11 +1449,10 @@
  /*
   * Another X Error handler, just used to check for errors.
@@ -19066 +20843 @@
      got_x_error = TRUE;
      return 0;
-@@ -1431,15 +1448,12 @@
+@@ -1431,15 +1465,12 @@
   */
  static int x_IOerror_check __ARGS((Display *dpy));
@@ -19083 +20860 @@
  # endif
  
-@@ -1448,10 +1462,9 @@
+@@ -1448,10 +1479,9 @@
   */
  static int x_IOerror_handler __ARGS((Display *dpy));
@@ -19095 +20872 @@
      xterm_dpy = NULL;
      x11_window = 0;
-@@ -1460,8 +1473,6 @@
+@@ -1460,8 +1490,6 @@
  
      /* This function should not return, it causes exit().  Longjump instead. */
@@ -19104 +20881 @@
  #endif
  
-@@ -1897,10 +1908,9 @@
+@@ -1897,10 +1925,9 @@
  
  #else  /* FEAT_X11 */
@@ -19116 +20893 @@
      return FALSE;
  }
-@@ -2438,7 +2448,7 @@
+@@ -2414,6 +2441,12 @@
+ #ifdef HAVE_FCHDIR
+            if (fd >= 0)
+            {
++               if (p_verbose >= 5)
++               {
++                   verbose_enter();
++                   MSG("fchdir() to previous dir");
++                   verbose_leave();
++               }
+                l = fchdir(fd);
+                close(fd);
+            }
+@@ -2438,7 +2471,7 @@
      }
  
@@ -19125 +20915 @@
  
      /* Do not append ".", "/dir/." is equal to "/dir". */
-@@ -2475,11 +2485,10 @@
+@@ -2475,11 +2508,10 @@
   * file name to remain exactly the same.
   * Only required for file systems where case is ignored and preserved.
@@ -19138 +20928 @@
      struct stat st;
      char_u     *slash, *tail;
-@@ -2657,7 +2666,7 @@
+@@ -2657,7 +2689,7 @@
   */
      vim_acl_T
@@ -19147 +20937 @@
      vim_acl_T  ret = NULL;
  #ifdef HAVE_POSIX_ACL
-@@ -2717,7 +2726,7 @@
+@@ -2717,7 +2749,7 @@
   */
      void
@@ -19156 +20946 @@
  {
      if (aclent == NULL)
-@@ -2760,10 +2769,9 @@
+@@ -2760,10 +2792,9 @@
  /*
   * Set hidden flag for "name".
@@ -19168 +20958 @@
      /* can't hide a file */
  }
-@@ -2905,7 +2913,7 @@
+@@ -2905,7 +2936,7 @@
       * Ignore any errors.
       */
@@ -19177 +20967 @@
  #endif
  }
-@@ -2936,7 +2944,8 @@
+@@ -2936,7 +2967,8 @@
      }
  #  endif
@@ -19187 +20977 @@
  #  ifdef FEAT_XCLIPBOARD
             && x11_display != xterm_dpy
-@@ -3451,10 +3460,9 @@
+@@ -3451,10 +3483,9 @@
  /*
   * set screen mode, always fails.
@@ -19199 +20989 @@
      EMSG(_(e_screenmode));
      return FAIL;
-@@ -3926,9 +3934,9 @@
+@@ -3926,9 +3957,9 @@
                  */
                 if (fd >= 0)
@@ -19212 +21002 @@
                     /* Don't need this now that we've duplicated it */
                     close(fd);
-@@ -3946,7 +3954,17 @@
+@@ -3946,7 +3977,17 @@
                  * children can be kill()ed.  Don't do this when using pipes,
                  * because stdin is not a tty, we would lose /dev/tty. */
@@ -19230 +21020 @@
  # ifdef FEAT_GUI
                 if (pty_slave_fd >= 0)
-@@ -3996,13 +4014,13 @@
+@@ -3996,13 +4037,13 @@
  
                     /* set up stdin/stdout/stderr for the child */
@@ -19247 +21037 @@
  
                     close(pty_slave_fd);    /* has been dupped, close it now */
-@@ -4013,13 +4031,13 @@
+@@ -4013,13 +4054,13 @@
                     /* set up stdin for the child */
                     close(fd_toshell[1]);
@@ -19263 +21053 @@
  
  # ifdef FEAT_GUI
-@@ -4027,7 +4045,7 @@
+@@ -4027,7 +4068,7 @@
                     {
                         /* set up stderr for the child */
@@ -19272 +21062 @@
  # endif
                 }
-@@ -4078,6 +4096,9 @@
+@@ -4078,6 +4119,9 @@
                 int         fromshell_fd;
                 garray_T    ga;
@@ -19282 +21072 @@
  # ifdef FEAT_GUI
                 if (pty_master_fd >= 0)
-@@ -4146,9 +4167,10 @@
+@@ -4146,9 +4190,10 @@
                             {
                                 s = vim_strchr(lp + written, NL);
@@ -19295 +21085 @@
                                 /* Finished a line, add a NL, unless this line
                                  * should not have one. */
-@@ -4158,7 +4180,8 @@
+@@ -4158,7 +4203,8 @@
                                             && (lnum !=
                                                     curbuf->b_ml.ml_line_count
@@ -19305 +21095 @@
                                 if (lnum > curbuf->b_op_end.lnum)
                                 {
-@@ -4186,7 +4209,9 @@
+@@ -4186,7 +4232,9 @@
                     ga_init2(&ga, 1, BUFLEN);
  
@@ -19316 +21106 @@
                 {
                     /*
-@@ -4199,25 +4224,34 @@
+@@ -4199,25 +4247,34 @@
                      * that a typed password is echoed for ssh or gpg command.
                      * Don't get characters when the child has already
@@ -19359 +21149 @@
                          * For pipes:
                          * Check for CTRL-C: send interrupt signal to child.
-@@ -4319,9 +4353,9 @@
+@@ -4271,7 +4328,8 @@
+                                ta_buf[i] = '\n';
+ # ifdef FEAT_MBYTE
+                            if (has_mbyte)
+-                               i += (*mb_ptr2len)(ta_buf + i) - 1;
++                               i += (*mb_ptr2len_len)(ta_buf + i,
++                                                       ta_len + len - i) - 1;
+ # endif
+                        }
+ 
+@@ -4319,9 +4377,9 @@
                             {
                                 ta_len -= len;
@@ -19370 +21170 @@
  
                     if (got_int)
-@@ -4429,6 +4463,25 @@
+@@ -4429,6 +4487,25 @@
                         out_flush();
                         if (got_int)
@@ -19396 +21196 @@
  
                     /* If we already detected the child has finished break the
-@@ -4672,7 +4725,6 @@
+@@ -4672,7 +4749,6 @@
   * Returns also, when a request from Sniff is waiting -- toni.
   * Or when a Linux GPM mouse event is waiting.
@@ -19404 +21204 @@
      int
  #else
-@@ -4681,7 +4733,7 @@
+@@ -4681,7 +4757,7 @@
  RealWaitForChar(fd, msec, check_for_gpm)
      int                fd;
@@ -19413 +21213 @@
      int                ret;
  #if defined(FEAT_XCLIPBOARD) || defined(USE_XSMP) || defined(FEAT_MZSCHEME)
-@@ -5076,7 +5128,6 @@
+@@ -5076,7 +5152,6 @@
  
  #define SHELL_SPECIAL (char_u *)"\t \"&'$;<>()\\|"
@@ -19421 +21221 @@
  mch_expand_wildcards(num_pat, pat, num_file, file, flags)
      int                   num_pat;
-@@ -5498,7 +5549,7 @@
+@@ -5498,7 +5573,7 @@
      i = fread((char *)buffer, 1, len, fd);
      fclose(fd);
@@ -19430 +21230 @@
         /* unexpected read error */
         EMSG2(_(e_notread), tempname);
-@@ -5559,7 +5610,7 @@
+@@ -5559,7 +5634,7 @@
         if (shell_style == STYLE_PRINT && !did_find_nul)
         {
@@ -19439 +21239 @@
             else
                 check_spaces = TRUE;
-@@ -5851,7 +5902,9 @@
+@@ -5851,7 +5926,9 @@
              * we are going to suspend or starting an external process
              * so we shouldn't  have problem with this
@@ -19449 +21249 @@
         }
         if (gpm_fd == -2)
-@@ -6001,7 +6054,6 @@
+@@ -6001,7 +6078,6 @@
  /*
   * Gets info from sysmouse and adds special keys to input buf.
@@ -19457 +21257 @@
  sig_sysmouse SIGDEFARG(sigarg)
  {
-@@ -6565,11 +6617,10 @@
+@@ -6565,11 +6641,10 @@
   * This is our chance to ask the user if they want to save,
   * or abort the logout
@@ -19470 +21270 @@
      cmdmod_T   save_cmdmod;
      int                cancel_shutdown = False;
-@@ -6602,16 +6653,15 @@
+@@ -6602,16 +6677,15 @@
  /*
   * Callback that starts save-yourself.
@@ -19491 +21291 @@
      /* Handle already being in saveyourself */
      if (xsmp.save_yourself)
-@@ -6645,11 +6695,10 @@
+@@ -6645,11 +6719,10 @@
  /*
   * Callback to warn us of imminent death.
@@ -19505 +21305 @@
      xsmp_close();
  
-@@ -6661,11 +6710,10 @@
+@@ -6661,11 +6734,10 @@
  /*
   * Callback to tell us that save-yourself has completed.
@@ -19519 +21319 @@
      xsmp.save_yourself = False;
  }
-@@ -6675,11 +6723,10 @@
+@@ -6675,11 +6747,10 @@
   * Callback to tell us that an instigated shutdown was cancelled
   * (maybe even by us)
@@ -19532 +21332 @@
      if (xsmp.save_yourself)
         SmcSaveYourselfDone(smc_conn, True);
-@@ -6691,13 +6738,12 @@
+@@ -6691,13 +6762,12 @@
  /*
   * Callback to tell us that a new ICE connection has been established.
@@ -19548 +21348 @@
      /* Intercept creation of ICE connection fd */
      if (opening)
-@@ -6814,7 +6860,8 @@
+@@ -6814,7 +6884,8 @@
      if (xsmp_icefd != -1)
      {
@@ -19560 +21360 @@
 diff -Naur vim72.orig/src/os_unix.h vim72/src/os_unix.h
 --- vim72.orig/src/os_unix.h    2008-06-17 11:01:17.000000000 -0700
-+++ vim72/src/os_unix.h 2009-06-05 14:24:58.000000000 -0700
++++ vim72/src/os_unix.h 2009-07-19 15:18:55.000000000 -0700
 @@ -124,7 +124,7 @@
  #  define SIGDUMMYARG  0, 0, (struct sigcontext *)0
@@ -19570 +21370 @@
  # endif
  #else
+@@ -482,11 +482,6 @@
+ # else
+ int mch_rename __ARGS((const char *src, const char *dest));
+ # endif
+-# ifdef VMS
+-#  define mch_chdir(s) chdir(vms_fixfilename(s))
+-# else
+-#  define mch_chdir(s) chdir(s)
+-# endif
+ # ifndef VMS
+ #  ifdef __MVS__
+   /* on OS390 Unix getenv() doesn't return a pointer to persistent
 diff -Naur vim72.orig/src/proto/buffer.pro vim72/src/proto/buffer.pro
 --- vim72.orig/src/proto/buffer.pro     2008-08-09 07:31:21.000000000 -0700
-+++ vim72/src/proto/buffer.pro  2009-06-05 14:24:27.000000000 -0700
++++ vim72/src/proto/buffer.pro  2009-07-19 15:15:54.000000000 -0700
 @@ -37,13 +37,12 @@
  int otherfile __ARGS((char_u *ffname));
@@ -19602 +21414 @@
 diff -Naur vim72.orig/src/proto/edit.pro vim72/src/proto/edit.pro
 --- vim72.orig/src/proto/edit.pro       2008-08-09 07:31:24.000000000 -0700
-+++ vim72/src/proto/edit.pro    2009-06-05 14:24:27.000000000 -0700
++++ vim72/src/proto/edit.pro    2009-07-19 15:15:54.000000000 -0700
 @@ -8,7 +8,7 @@
  void backspace_until_column __ARGS((int col));
@@ -19614 +21426 @@
 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-06-05 14:17:16.000000000 -0700
++++ vim72/src/proto/eval.pro    2009-07-19 15:10:37.000000000 -0700
 @@ -17,7 +17,7 @@
  int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip));
@@ -19656 +21468 @@
 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-06-05 14:24:34.000000000 -0700
++++ vim72/src/proto/ex_cmds.pro 2009-07-19 15:16:00.000000000 -0700
 @@ -9,9 +9,9 @@
  void do_bang __ARGS((int addr_count, exarg_T *eap, int forceit, int do_in, int do_out));
@@ -19680 +21492 @@
 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-06-05 14:22:42.000000000 -0700
++++ vim72/src/proto/ex_getln.pro        2009-07-19 15:14:20.000000000 -0700
 @@ -4,6 +4,7 @@
  int text_locked __ARGS((void));
@@ -19698 +21510 @@
  int get_histtype __ARGS((char_u *name));
  void add_to_history __ARGS((int histype, char_u *new_entry, int in_map, int sep));
+diff -Naur vim72.orig/src/proto/gui.pro vim72/src/proto/gui.pro
+--- vim72.orig/src/proto/gui.pro        2008-08-09 07:31:56.000000000 -0700
++++ vim72/src/proto/gui.pro     2009-07-19 15:17:39.000000000 -0700
+@@ -43,6 +43,7 @@
+ void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp));
+ scrollbar_T *gui_find_scrollbar __ARGS((long ident));
+ void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging));
++void gui_may_update_scrollbars __ARGS((void));
+ void gui_update_scrollbars __ARGS((int force));
+ int gui_do_scroll __ARGS((void));
+ int gui_do_horiz_scroll __ARGS((void));
 diff -Naur vim72.orig/src/proto/if_cscope.pro vim72/src/proto/if_cscope.pro
 --- vim72.orig/src/proto/if_cscope.pro  2008-08-09 07:31:33.000000000 -0700
-+++ vim72/src/proto/if_cscope.pro       2009-06-05 14:23:53.000000000 -0700
++++ vim72/src/proto/if_cscope.pro       2009-07-19 15:15:24.000000000 -0700
 @@ -1,4 +1,6 @@
  /* if_cscope.c */
@@ -19710 +21533 @@
 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-06-05 14:16:09.000000000 -0700
++++ vim72/src/proto/mark.pro    2009-07-19 15:09:53.000000000 -0700
 @@ -26,5 +26,5 @@
  void write_viminfo_filemarks __ARGS((FILE *fp));
@@ -19718 +21541 @@
 +void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof, int flags));
  /* vim: set ft=c : */
+diff -Naur vim72.orig/src/proto/mbyte.pro vim72/src/proto/mbyte.pro
+--- vim72.orig/src/proto/mbyte.pro      2008-08-09 07:31:41.000000000 -0700
++++ vim72/src/proto/mbyte.pro   2009-07-19 15:17:30.000000000 -0700
+@@ -7,10 +7,12 @@
+ int latin_char2len __ARGS((int c));
+ int latin_char2bytes __ARGS((int c, char_u *buf));
+ int latin_ptr2len __ARGS((char_u *p));
++int latin_ptr2len_len __ARGS((char_u *p, int size));
+ int utf_char2cells __ARGS((int c));
+ int latin_ptr2cells __ARGS((char_u *p));
+ int utf_ptr2cells __ARGS((char_u *p));
+ int dbcs_ptr2cells __ARGS((char_u *p));
++int latin_ptr2cells_len __ARGS((char_u *p, int size));
+ int latin_char2cells __ARGS((int c));
+ int latin_off2cells __ARGS((unsigned off, unsigned max_off));
+ int dbcs_off2cells __ARGS((unsigned off, unsigned max_off));
+@@ -85,6 +87,7 @@
+ int preedit_get_status __ARGS((void));
+ int im_is_preediting __ARGS((void));
+ int convert_setup __ARGS((vimconv_T *vcp, char_u *from, char_u *to));
++int convert_setup_ext __ARGS((vimconv_T *vcp, char_u *from, int from_unicode_is_utf8, char_u *to, int to_unicode_is_utf8));
+ int convert_input __ARGS((char_u *ptr, int len, int maxlen));
+ int convert_input_safe __ARGS((char_u *ptr, int len, int maxlen, char_u **restp, int *restlenp));
+ char_u *string_convert __ARGS((vimconv_T *vcp, char_u *ptr, int *lenp));
 diff -Naur vim72.orig/src/proto/message.pro vim72/src/proto/message.pro
 --- vim72.orig/src/proto/message.pro    2008-08-09 07:31:39.000000000 -0700
-+++ vim72/src/proto/message.pro 2009-06-05 14:23:41.000000000 -0700
++++ vim72/src/proto/message.pro 2009-07-19 15:15:14.000000000 -0700
 @@ -54,6 +54,7 @@
  void msg_clr_cmdline __ARGS((void));
@@ -19731 +21578 @@
 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-06-05 14:19:07.000000000 -0700
++++ vim72/src/proto/misc2.pro   2009-07-19 15:11:46.000000000 -0700
 @@ -59,7 +59,7 @@
  int handle_x_keys __ARGS((int key));
@@ -19743 +21590 @@
 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-06-05 14:19:24.000000000 -0700
++++ vim72/src/proto/netbeans.pro        2009-07-19 15:12:02.000000000 -0700
 @@ -11,7 +11,7 @@
  void netbeans_frame_moved __ARGS((int new_x, int new_y));
@@ -19755 +21602 @@
 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-06-05 14:21:21.000000000 -0700
++++ vim72/src/proto/option.pro  2009-07-19 15:13:20.000000000 -0700
 @@ -44,6 +44,7 @@
  void set_context_in_set_cmd __ARGS((expand_T *xp, char_u *arg, int opt_flags));
@@ -19764 +21611 @@
  int shortmess __ARGS((int x));
  void vimrc_found __ARGS((char_u *fname, char_u *envname));
+diff -Naur vim72.orig/src/proto/os_unix.pro vim72/src/proto/os_unix.pro
+--- vim72.orig/src/proto/os_unix.pro    2008-08-09 07:31:44.000000000 -0700
++++ vim72/src/proto/os_unix.pro 2009-07-19 15:18:55.000000000 -0700
+@@ -1,4 +1,5 @@
+ /* os_unix.c */
++int mch_chdir __ARGS((char *path));
+ void mch_write __ARGS((char_u *s, int len));
+ int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt));
+ int mch_char_avail __ARGS((void));
 diff -Naur vim72.orig/src/proto/spell.pro vim72/src/proto/spell.pro
 --- vim72.orig/src/proto/spell.pro      2008-08-09 07:31:48.000000000 -0700
-+++ vim72/src/proto/spell.pro   2009-06-05 14:24:34.000000000 -0700
++++ vim72/src/proto/spell.pro   2009-07-19 15:16:00.000000000 -0700
 @@ -22,5 +22,5 @@
  char_u *spell_to_word_end __ARGS((char_u *start, buf_T *buf));
@@ -19774 +21630 @@
 +int expand_spelling __ARGS((linenr_T lnum, char_u *pat, char_u ***matchp));
  /* vim: set ft=c : */
+diff -Naur vim72.orig/src/proto/ui.pro vim72/src/proto/ui.pro
+--- vim72.orig/src/proto/ui.pro 2008-08-09 07:31:52.000000000 -0700
++++ vim72/src/proto/ui.pro      2009-07-19 15:18:26.000000000 -0700
+@@ -48,6 +48,7 @@
+ void open_app_context __ARGS((void));
+ void x11_setup_atoms __ARGS((Display *dpy));
+ void clip_x11_request_selection __ARGS((Widget myShell, Display *dpy, VimClipboard *cbd));
++void yank_cut_buffer0 __ARGS((Display *dpy, VimClipboard *cbd));
+ void clip_x11_lose_selection __ARGS((Widget myShell, VimClipboard *cbd));
+ int clip_x11_own_selection __ARGS((Widget myShell, VimClipboard *cbd));
+ void clip_x11_set_selection __ARGS((VimClipboard *cbd));
+diff -Naur vim72.orig/src/proto/window.pro vim72/src/proto/window.pro
+--- vim72.orig/src/proto/window.pro     2008-08-09 07:31:54.000000000 -0700
++++ vim72/src/proto/window.pro  2009-07-19 15:18:10.000000000 -0700
+@@ -1,6 +1,7 @@
+ /* window.c */
+ void do_window __ARGS((int nchar, long Prenum, int xchar));
+ int win_split __ARGS((int size, int flags));
++int win_split_ins __ARGS((int size, int flags, win_T *newwin, int dir));
+ int win_valid __ARGS((win_T *win));
+ int win_count __ARGS((void));
+ int make_windows __ARGS((int count, int vertical));
+@@ -10,9 +11,12 @@
+ void win_close __ARGS((win_T *win, int free_buf));
+ void win_close_othertab __ARGS((win_T *win, int free_buf, tabpage_T *tp));
+ void win_free_all __ARGS((void));
++win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp));
+ void close_others __ARGS((int message, int forceit));
+ void curwin_init __ARGS((void));
++void win_init_empty __ARGS((win_T *wp));
+ int win_alloc_first __ARGS((void));
++void win_alloc_aucmd_win __ARGS((void));
+ void win_init_size __ARGS((void));
+ void free_tabpage __ARGS((tabpage_T *tp));
+ int win_new_tabpage __ARGS((int after));
+@@ -30,6 +34,8 @@
+ void win_enter __ARGS((win_T *wp, int undo_sync));
+ win_T *buf_jump_open_win __ARGS((buf_T *buf));
+ win_T *buf_jump_open_tab __ARGS((buf_T *buf));
++void win_append __ARGS((win_T *after, win_T *wp));
++void win_remove __ARGS((win_T *wp, tabpage_T *tp));
+ int win_alloc_lines __ARGS((win_T *wp));
+ void win_free_lsize __ARGS((win_T *wp));
+ void shell_new_rows __ARGS((void));
+@@ -58,6 +64,8 @@
+ int min_rows __ARGS((void));
+ int only_one_window __ARGS((void));
+ void check_lnums __ARGS((int do_curwin));
++void make_snapshot __ARGS((int idx));
++void restore_snapshot __ARGS((int idx, int close_curwin));
+ int win_hasvertsplit __ARGS((void));
+ int match_add __ARGS((win_T *wp, char_u *grp, char_u *pat, int prio, int id));
+ int match_delete __ARGS((win_T *wp, int id, int perr));
 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-06-05 14:13:54.000000000 -0700
++++ vim72/src/pty.c     2009-07-19 15:08:34.000000000 -0700
 @@ -270,9 +270,10 @@
  }
@@ -19792 +21701 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/quickfix.c        2009-07-19 15:18:10.000000000 -0700
 @@ -1419,6 +1419,7 @@
      int                        opened_window = FALSE;
@@ -19941 +21850 @@
                 }
                 line_breakcheck();
+@@ -3397,14 +3406,15 @@
+     /* Init the options. */
+     buf_copy_options(newbuf, BCO_ENTER | BCO_NOHELP);
+ 
+-    /* set curwin/curbuf to buf and save a few things */
+-    aucmd_prepbuf(&aco, newbuf);
++    /* need to open the memfile before putting the buffer in a window */
++    if (ml_open(newbuf) == OK)
++    {
++       /* set curwin/curbuf to buf and save a few things */
++       aucmd_prepbuf(&aco, newbuf);
+ 
+-    /* Need to set the filename for autocommands. */
+-    (void)setfname(curbuf, fname, NULL, FALSE);
++       /* Need to set the filename for autocommands. */
++       (void)setfname(curbuf, fname, NULL, FALSE);
+ 
+-    if (ml_open(curbuf) == OK)
+-    {
+        /* Create swap file now to avoid the ATTENTION message. */
+        check_need_swap(TRUE);
+ 
+@@ -3427,10 +3437,10 @@
+                newbuf = curbuf;
+            }
+        }
+-    }
+ 
+-    /* restore curwin/curbuf and a few other things */
+-    aucmd_restbuf(&aco);
++       /* restore curwin/curbuf and a few other things */
++       aucmd_restbuf(&aco);
++    }
+ 
+     if (!buf_valid(newbuf))
+        return NULL;
 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-06-05 14:24:51.000000000 -0700
++++ vim72/src/regexp.c  2009-07-19 15:16:14.000000000 -0700
 @@ -471,7 +471,7 @@
  
@@ -20003 +21948 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/screen.c  2009-07-19 15:17:49.000000000 -0700
 @@ -270,11 +270,10 @@
   * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot
@@ -20194 +22139 @@
              * and for some xterms. */
             if (
-@@ -6076,7 +6096,7 @@
+@@ -5723,6 +5743,13 @@
+     int                fillchar;
+     int                attr;
+     int                this_ru_col;
++    static int  busy = FALSE;
++
++    /* It's possible to get here recursively when 'statusline' (indirectly)
++     * invokes ":redrawstatus".  Simply ignore the call then. */
++    if (busy)
++       return;
++    busy = TRUE;
+ 
+     wp->w_redr_status = FALSE;
+     if (wp->w_status_height == 0)
+@@ -5861,6 +5888,7 @@
+                                                                        attr);
+     }
+ #endif
++    busy = FALSE;
+ }
+ 
+ #ifdef FEAT_STL_OPT
+@@ -6076,7 +6104,7 @@
                                 fillchar, maxwidth, hltab, tabtab);
      len = (int)STRLEN(buf);
@@ -20203 +22170 @@
  #ifdef FEAT_MBYTE
         len += (*mb_char2bytes)(fillchar, buf + len);
-@@ -6263,9 +6283,15 @@
+@@ -6263,9 +6291,15 @@
      int                pcc[MAX_MCO];
  # endif
@@ -20219 +22186 @@
  #ifdef FEAT_MBYTE
      /* When drawing over the right halve of a double-wide char clear out the
-@@ -6275,10 +6301,21 @@
+@@ -6275,10 +6309,21 @@
             && !gui.in_use
  # endif
@@ -20243 +22210 @@
      max_off = LineOffset[row] + screen_Columns;
  #endif
-@@ -6342,7 +6379,12 @@
+@@ -6342,7 +6387,12 @@
         }
  #endif
@@ -20257 +22224 @@
                 || (mbyte_cells == 2
                     && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0))
-@@ -6350,24 +6392,24 @@
+@@ -6350,24 +6400,24 @@
                     && c == 0x8e
                     && ScreenLines2[off] != ptr[1])
@@ -20291 +22258 @@
                     gui.in_use
  # endif
-@@ -6377,23 +6419,14 @@
+@@ -6377,23 +6427,14 @@
  # ifdef UNIX
                     term_is_xterm
@@ -20321 +22288 @@
  #endif
  #ifdef FEAT_MBYTE
-@@ -6480,6 +6513,20 @@
+@@ -6480,6 +6521,20 @@
             ++ptr;
         }
@@ -20342 +22309 @@
  
  #ifdef FEAT_SEARCH_EXTRA
-@@ -7356,7 +7403,11 @@
+@@ -7356,7 +7411,11 @@
  #endif
      static int     entered = FALSE;            /* avoid recursiveness */
@@ -20354 +22321 @@
       * 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 +7491,13 @@
+@@ -7440,10 +7499,17 @@
         {
             outofmem = TRUE;
@@ -20363 +22330 @@
         }
      }
++#ifdef FEAT_AUTOCMD
++    if (aucmd_win != NULL && win_alloc_lines(aucmd_win) == FAIL)
++       outofmem = TRUE;
++#endif
 +#ifdef FEAT_WINDOWS
 +give_up:
@@ -20369 +22340 @@
  #ifdef FEAT_MBYTE
      for (i = 0; i < p_mco; ++i)
-@@ -7628,8 +7682,17 @@
+@@ -7628,8 +7694,17 @@
      --RedrawingDisabled;
  
@@ -20388 +22359 @@
  }
  
-@@ -8590,7 +8653,6 @@
+@@ -8590,7 +8665,6 @@
   *
   * Return OK for success, FAIL if the lines are not deleted.
@@ -20396 +22367 @@
  screen_del_lines(off, row, line_count, end, force, wp)
      int                off;
-@@ -8598,7 +8660,7 @@
+@@ -8598,7 +8672,7 @@
      int                line_count;
      int                end;
@@ -20405 +22376 @@
      int                j;
      int                i;
-@@ -9416,13 +9478,15 @@
+@@ -9416,13 +9490,15 @@
      win_T      *wp;
      int                always;
@@ -20422 +22393 @@
  #ifdef FEAT_VERTSPLIT
      int                this_ru_col;
-@@ -9537,11 +9601,12 @@
+@@ -9537,11 +9613,12 @@
          * Some sprintfs return the length, some return a pointer.
          * To avoid portability problems we use strlen() here.
@@ -20437 +22408 @@
                         (int)virtcol + 1);
  
-@@ -9551,7 +9616,7 @@
+@@ -9551,7 +9628,7 @@
          * screen up on some terminals).
          */
@@ -20446 +22417 @@
  #ifdef FEAT_WINDOWS
         if (wp->w_status_height == 0)   /* can't use last char of screen */
-@@ -9578,7 +9643,7 @@
+@@ -9578,7 +9655,7 @@
                     buffer[i++] = fillchar;
                 ++o;
@@ -20457 +22428 @@
 diff -Naur vim72.orig/src/search.c vim72/src/search.c
 --- vim72.orig/src/search.c     2008-07-13 11:18:27.000000000 -0700
-+++ vim72/src/search.c  2009-06-05 14:25:15.000000000 -0700
++++ vim72/src/search.c  2009-07-19 15:16:33.000000000 -0700
 @@ -345,6 +345,15 @@
  {
@@ -20598 +22569 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/spell.c   2009-07-19 15:16:33.000000000 -0700
 @@ -77,7 +77,7 @@
  
@@ -21550 +23521 @@
 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-06-05 14:24:58.000000000 -0700
++++ vim72/src/structs.h 2009-07-19 15:18:36.000000000 -0700
 @@ -16,7 +16,7 @@
   */
@@ -21581 +23552 @@
  # endif
  # ifdef FEAT_WINDOWS
-@@ -1166,7 +1166,8 @@
+@@ -882,6 +882,8 @@
+ {
+     typebuf_T          save_typebuf;
+     int                        typebuf_valid;      /* TRUE when save_typebuf valid */
++    int                        old_char;
++    int                        old_mod_mask;
+     struct buffheader  save_stuffbuff;
+ #ifdef USE_INPUT_BUF
+     char_u             *save_inputbuf;
+@@ -1166,7 +1168,8 @@
      char_u     *b_fname;       /* current file name */
  
@@ -21591 +23571 @@
  #endif
  #ifdef FEAT_CW_EDITOR
-@@ -1784,10 +1785,15 @@
+@@ -1620,6 +1623,14 @@
+ };
+ #endif
+ 
++#define SNAP_HELP_IDX  0
++#ifdef FEAT_AUTOCMD
++# define SNAP_AUCMD_IDX 1
++# define SNAP_COUNT    2
++#else
++# define SNAP_COUNT    1
++#endif
++
+ /*
+  * Tab pages point to the top frame of each tab page.
+  * Note: Most values are NOT valid for the current tab page!  Use "curwin",
+@@ -1648,7 +1659,7 @@
+     buf_T          *(tp_diffbuf[DB_COUNT]);
+     int                    tp_diff_invalid;    /* list of diffs is outdated */
+ #endif
+-    frame_T        *tp_snapshot;    /* window layout snapshot */
++    frame_T        *(tp_snapshot[SNAP_COUNT]);  /* window layout snapshots */
+ #ifdef FEAT_EVAL
+     dictitem_T     tp_winvar;      /* variable for "t:" Dictionary */
+     dict_T         tp_vars;        /* internal variables, local to tab page */
+@@ -1784,10 +1795,15 @@
  #endif
  
@@ -21608 +23612 @@
      int                w_topfill;          /* number of filler lines above w_topline */
      int                w_old_topfill;      /* w_topfill at last redraw */
+@@ -2270,16 +2286,11 @@
+  */
+ typedef struct
+ {
+-    buf_T      *save_buf;      /* saved curbuf */
++    buf_T      *save_curbuf;   /* saved curbuf */
+ #ifdef FEAT_AUTOCMD
+-    buf_T      *new_curbuf;    /* buffer to be used */
+-    win_T      *save_curwin;   /* saved curwin, NULL if it didn't change */
+-    win_T      *new_curwin;    /* new curwin if save_curwin != NULL */
+-    pos_T      save_cursor;    /* saved cursor pos of save_curwin */
+-    linenr_T   save_topline;   /* saved topline of save_curwin */
+-# ifdef FEAT_DIFF
+-    int                save_topfill;   /* saved topfill of save_curwin */
+-# endif
++    win_T      *save_curwin;   /* saved curwin */
++    win_T      *new_curwin;    /* new curwin */
++    buf_T      *new_curbuf;    /* new curbuf */
+ #endif
+ } aco_save_T;
+ 
 diff -Naur vim72.orig/src/syntax.c vim72/src/syntax.c
 --- vim72.orig/src/syntax.c     2008-08-08 14:47:48.000000000 -0700
-+++ vim72/src/syntax.c  2009-06-05 14:25:15.000000000 -0700
++++ vim72/src/syntax.c  2009-07-19 15:16:33.000000000 -0700
 @@ -3224,11 +3224,10 @@
  /*
@@ -21798 +23823 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/tag.c     2009-07-19 15:16:33.000000000 -0700
 @@ -100,7 +100,7 @@
   * Tag for preview window is remembered separately, to avoid messing up the
@@ -21972 +23997 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/term.c    2009-07-19 15:17:27.000000000 -0700
 @@ -2906,7 +2906,7 @@
      int            i;
@@ -22008 +24033 @@
         {
             string[new_slen++] = K_SPECIAL;
+@@ -5547,7 +5555,7 @@
+  * respects the current B/k/< settings of 'cpoption'.
+  *
+  * This function is called when expanding mappings/abbreviations on the
+- * command-line, and for building the "Ambiguous mapping..." error messæge.
++ * command-line, and for building the "Ambiguous mapping..." error message.
+  *
+  * It uses a growarray to build the translation string since the
+  * latter can be wider than the original description. The caller has to
 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-06-05 14:22:57.000000000 -0700
-@@ -20,21 +20,23 @@
++++ vim72/src/testdir/Makefile  2009-07-19 15:18:15.000000000 -0700
+@@ -4,9 +4,11 @@
+ 
+ VIMPROG = ../vim
+ 
+-# Uncomment this line for using valgrind.
+-# The output goes into a file "valgrind.$PID" (sorry, no test number).
+-# VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=15 --logfile=valgrind
++# Uncomment this line to use valgrind for memory leaks and extra warnings.
++#   The output goes into a file "valgrind.testN"
++#   Vim should be compiled with EXITFREE to avoid false warnings.
++#   This will make testing about 10 times as slow.
++# VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=15 --log-file=valgrind.$*
+ 
+ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
+                test7.out test8.out test9.out test10.out test11.out \
+@@ -20,21 +22,23 @@
                 test48.out test49.out test51.out test52.out test53.out \
                 test54.out test55.out test56.out test57.out test58.out \
@@ -22043 +24092 @@
  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
  
-@@ -71,4 +73,4 @@
+@@ -71,4 +75,4 @@
  test60.out: test60.vim
  
@@ -22051 +24100 @@
 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-06-05 14:15:34.000000000 -0700
++++ vim72/src/testdir/Make_ming.mak     2009-07-19 15:09:28.000000000 -0700
 @@ -0,0 +1,91 @@
 +# Makefile to run tests for Vim, on Dos-like machines
@@ -22146 +24195 @@
 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-06-05 14:16:16.000000000 -0700
++++ vim72/src/testdir/test42.ok 2009-07-19 15:09:58.000000000 -0700
 @@ -20,7 +20,7 @@
  ucs-2
@@ -22158 +24207 @@
 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-06-05 14:22:57.000000000 -0700
++++ vim72/src/testdir/test66.in 2009-07-19 15:14:34.000000000 -0700
 @@ -0,0 +1,25 @@
 +
@@ -22187 +24236 @@
 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-06-05 14:22:57.000000000 -0700
++++ vim72/src/testdir/test66.ok 2009-07-19 15:14:34.000000000 -0700
 @@ -0,0 +1,10 @@
 +    abcdefghijklmnopqrstuvwxyz
@@ -22201 +24250 @@
 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-06-05 14:25:15.000000000 -0700
++++ vim72/src/ui.c      2009-07-19 15:18:26.000000000 -0700
 @@ -320,10 +320,9 @@
   * The gui_set_shellsize() or mch_set_shellsize() function will try to set the
@@ -22278 +24327 @@
                                                          &text_list, &n_text);
         if (status != Success || n_text < 1)
-@@ -2110,6 +2106,8 @@
+@@ -2108,8 +2104,8 @@
+     Atom       type;
+     static int success;
      int                i;
-     int                nbytes = 0;
-     char_u     *buffer;
+-    int                nbytes = 0;
+-    char_u     *buffer;
 +    time_t     start_time;
 +    int                timed_out = FALSE;
@@ -22287 +24338 @@
      for (i =
  #ifdef FEAT_MBYTE
-@@ -2129,6 +2127,7 @@
+@@ -2129,6 +2125,7 @@
             case 3:  type = text_atom;          break;
             default: type = XA_STRING;
@@ -22295 +24346 @@
             clip_x11_request_selection_cb, (XtPointer)&success, CurrentTime);
  
-@@ -2141,27 +2140,48 @@
+@@ -2141,47 +2138,59 @@
          * characters, then they will appear before the one that requested the
          * paste!  Don't worry, we will catch up with any other events later.
@@ -22356 +24407 @@
  
      /* Final fallback position - use the X CUT_BUFFER0 store */
-@@ -2178,10 +2198,9 @@
+-    buffer = (char_u *)XFetchBuffer(dpy, &nbytes, 0);
+-    if (nbytes > 0)
+-    {
+-       /* Got something */
+-       clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd);
+-       XFree((void *)buffer);
+-       if (p_verbose > 0)
+-           verb_msg((char_u *)_("Used CUT_BUFFER0 instead of empty selection"));
+-    }
++    yank_cut_buffer0(dpy, cbd);
+ }
  
  static Boolean clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
@@ -22368 +24429 @@
      Atom       *target;
      Atom       *type;
-@@ -2308,10 +2327,9 @@
+@@ -2308,10 +2317,9 @@
  
  static void  clip_x11_lose_ownership_cb __ARGS((Widget, Atom *));
@@ -22380 +24441 @@
  {
      if (*sel_atom == clip_plus.sel_atom)
-@@ -2344,10 +2362,9 @@
+@@ -2344,14 +2352,67 @@
   * Send the current selection to the clipboard.  Do nothing for X because we
   * will fill in the selection only when requested by another app.
@@ -22392 +24453 @@
  }
  #endif
-@@ -2898,11 +2915,10 @@
+ 
++#if defined(FEAT_XCLIPBOARD) || defined(FEAT_GUI_X11) \
++    || defined(FEAT_GUI_GTK) || defined(PROTO)
++/*
++ * Get the contents of the X CUT_BUFFER0 and put it in "cbd".
++ */
++    void
++yank_cut_buffer0(dpy, cbd)
++    Display            *dpy;
++    VimClipboard       *cbd;
++{
++    int                nbytes = 0;
++    char_u     *buffer = (char_u *)XFetchBuffer(dpy, &nbytes, 0);
++
++    if (nbytes > 0)
++    {
++#ifdef FEAT_MBYTE
++       int  done = FALSE;
++
++       /* CUT_BUFFER0 is supposed to be always latin1.  Convert to 'enc' when
++        * using a multi-byte encoding.  Conversion between two 8-bit
++        * character sets usually fails and the text might actually be in
++        * 'enc' anyway. */
++       if (has_mbyte)
++       {
++           char_u      *conv_buf = buffer;
++           vimconv_T   vc;
++
++           vc.vc_type = CONV_NONE;
++           if (convert_setup(&vc, (char_u *)"latin1", p_enc) == OK)
++           {
++               conv_buf = string_convert(&vc, buffer, &nbytes);
++               if (conv_buf != NULL)
++               {
++                   clip_yank_selection(MCHAR, conv_buf, (long)nbytes, cbd);
++                   vim_free(conv_buf);
++                   done = TRUE;
++               }
++               convert_setup(&vc, NULL, NULL);
++           }
++       }
++       if (!done)  /* use the text without conversion */
++#endif
++           clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd);
++       XFree((void *)buffer);
++       if (p_verbose > 0)
++       {
++           verbose_enter();
++           verb_msg((char_u *)_("Used CUT_BUFFER0 instead of empty selection"));
++           verbose_leave();
++       }
++    }
++}
++#endif
++
+ #if defined(FEAT_MOUSE) || defined(PROTO)
+ 
+ /*
+@@ -2898,11 +2959,10 @@
   * Find the window at screen position "*rowp" and "*colp".  The positions are
   * updated to become relative to the top-left of the window.
@@ -22407 +24526 @@
 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-06-05 14:26:12.000000000 -0700
-@@ -677,9 +677,380 @@
++++ vim72/src/version.c 2009-07-19 15:19:00.000000000 -0700
+@@ -677,9 +677,444 @@
  static int included_patches[] =
  {   /* Add new patch number below this line */
  /**/
++    234,
++/**/
++    232,
++/**/
++    231,
++/**/
++    230,
++/**/
++    229,
++/**/
++    228,
++/**/
++    227,
++/**/
++    226,
++/**/
++    225,
++/**/
++    224,
++/**/
++    223,
++/**/
++    222,
++/**/
++    221,
++/**/
++    220,
++/**/
++    218,
++/**/
++    217,
++/**/
++    215,
++/**/
++    214,
++/**/
++    213,
++/**/
++    211,
++/**/
++    210,
++/**/
++    209,
++/**/
++    208,
++/**/
++    207,
++/**/
++    206,
++/**/
++    203,
++/**/
++    202,
++/**/
++    201,
++/**/
++    200,
++/**/
++    199,
++/**/
++    198,
++/**/
++    197,
++/**/
 +    196,
 +/**/
@@ -22789 +24972 @@
  highest_patch()
  {
-@@ -786,7 +1157,7 @@
+@@ -786,7 +1221,7 @@
      MSG_PUTS(_("\nRISC OS version"));
  #endif
@@ -22798 +24981 @@
      if (*compiled_arch != NUL)
      {
-@@ -825,6 +1196,19 @@
+@@ -825,6 +1260,19 @@
         }
      }
@@ -22820 +25003 @@
 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-06-05 14:24:34.000000000 -0700
++++ vim72/src/vim.h     2009-07-19 15:17:25.000000000 -0700
 @@ -341,8 +341,14 @@
  #ifdef BACKSLASH_IN_FILENAME
@@ -22864 +25047 @@
  /*
   * arguments for gui_set_shellsize()
+@@ -1328,11 +1337,11 @@
+ # define MSG_BUF_CLEN  MSG_BUF_LEN         /* cell length */
+ #endif
+ 
+-#if defined(AMIGA) || defined(__linux__) || defined(__QNX__) || defined(__CYGWIN32__) || defined(_AIX)
+-# define TBUFSZ 2048           /* buffer size for termcap entry */
+-#else
+-# define TBUFSZ 1024           /* buffer size for termcap entry */
+-#endif
++/* Size of the buffer used for tgetent().  Unfortunately this is largely
++ * undocumented, some systems use 1024.  Using a buffer that is too small
++ * causes a buffer overrun and a crash.  Use the maximum known value to stay
++ * on the safe side. */
++#define TBUFSZ 2048            /* buffer size for termcap entry */
+ 
+ /*
+  * Maximum length of key sequence to be mapped.
 @@ -1451,8 +1460,8 @@
  # define PERROR(msg)               perror(msg)
@@ -22908 +25108 @@
 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-06-05 14:25:31.000000000 -0700
-@@ -12,7 +12,7 @@
++++ vim72/src/window.c  2009-07-19 15:18:10.000000000 -0700
+@@ -11,8 +11,8 @@
+ 
  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 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 win_init_some __ARGS((win_T *newp, win_T *oldp));
  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 @@
+@@ -23,8 +23,8 @@
+ static void win_totop __ARGS((int size, int flags));
+ static void win_equal_rec __ARGS((win_T *next_curwin, int current, frame_T *topfr, int dir, int col, int row, int width, int height));
+ static int last_window __ARGS((void));
++static int one_window __ARGS((void));
+ static win_T *win_free_mem __ARGS((win_T *win, int *dirp, tabpage_T *tp));
+-static win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp));
+ static frame_T *win_altframe __ARGS((win_T *win, tabpage_T *tp));
+ static tabpage_T *alt_tabpage __ARGS((void));
+ static win_T *frame2win __ARGS((frame_T *frp));
+@@ -41,6 +41,7 @@
+ #endif
+ #endif
+ static int win_alloc_firstwin __ARGS((win_T *oldwin));
++static void new_frame __ARGS((win_T *wp));
+ #if defined(FEAT_WINDOWS) || defined(PROTO)
+ static tabpage_T *alloc_tabpage __ARGS((void));
+ static int leave_tabpage __ARGS((buf_T *new_curbuf));
+@@ -49,8 +50,6 @@
+ static int frame_minheight __ARGS((frame_T *topfrp, win_T *next_curwin));
+ static void win_enter_ext __ARGS((win_T *wp, int undo_sync, int no_curwin));
+ static void win_free __ARGS((win_T *wp, tabpage_T *tp));
+-static void win_append __ARGS((win_T *, win_T *));
+-static void win_remove __ARGS((win_T *, tabpage_T *tp));
+ static void frame_append __ARGS((frame_T *after, frame_T *frp));
+ static void frame_insert __ARGS((frame_T *before, frame_T *frp));
+ static void frame_remove __ARGS((frame_T *frp));
+@@ -62,17 +61,15 @@
+ static void frame_add_height __ARGS((frame_T *frp, int n));
+ static void last_status_rec __ARGS((frame_T *fr, int statusline));
+ 
+-static void make_snapshot __ARGS((void));
+ static void make_snapshot_rec __ARGS((frame_T *fr, frame_T **frp));
+-static void clear_snapshot __ARGS((tabpage_T *tp));
++static void clear_snapshot __ARGS((tabpage_T *tp, int idx));
+ static void clear_snapshot_rec __ARGS((frame_T *fr));
+-static void restore_snapshot __ARGS((int close_curwin));
+ static int check_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
+ static win_T *restore_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
+ 
+ #endif /* FEAT_WINDOWS */
+ 
+-static win_T *win_alloc __ARGS((win_T *after));
++static win_T *win_alloc __ARGS((win_T *after, int hidden));
+ static void win_new_height __ARGS((win_T *, int));
+ 
+ #define URL_SLASH      1               /* path_is_url() has found "://" */
+@@ -259,7 +256,7 @@
+ /* cursor to previous window with wrap around */
+     case 'W':
+                CHECK_CMDWIN
+-               if (lastwin == firstwin && Prenum != 1) /* just one window */
++               if (firstwin == lastwin && Prenum != 1) /* just one window */
+                    beep_flush();
+                else
+                {
+@@ -343,7 +340,7 @@
+ 
+ /* move window to new tab page */
+     case 'T':
+-               if (firstwin == lastwin)
++               if (one_window())
+                    MSG(_(m_onlyone));
+                else
+                {
+@@ -593,9 +590,7 @@
                 ++allow_keys;   /* no mapping for xchar, but allow key codes */
                 if (xchar == NUL)
@@ -22928 +25195 @@
                 --allow_keys;
  #ifdef FEAT_CMDL_INFO
-@@ -912,7 +910,7 @@
+@@ -680,9 +675,9 @@
+     /* When creating the help window make a snapshot of the window layout.
+      * Otherwise clear the snapshot, it's now invalid. */
+     if (flags & WSP_HELP)
+-       make_snapshot();
++       make_snapshot(SNAP_HELP_IDX);
+     else
+-       clear_snapshot(curtab);
++       clear_snapshot(curtab, SNAP_HELP_IDX);
+ 
+     return win_split_ins(size, flags, NULL, 0);
+ }
+@@ -693,7 +688,7 @@
+  * top/left/right/bottom.
+  * return FAIL for failure, OK otherwise
+  */
+-    static int
++    int
+ win_split_ins(size, flags, newwin, dir)
+     int                size;
+     int                flags;
+@@ -894,14 +889,14 @@
+     {
+        /* new window below/right of current one */
+        if (newwin == NULL)
+-           wp = win_alloc(oldwin);
++           wp = win_alloc(oldwin, FALSE);
+        else
+            win_append(oldwin, wp);
+     }
+     else
+     {
+        if (newwin == NULL)
+-           wp = win_alloc(oldwin->w_prev);
++           wp = win_alloc(oldwin->w_prev, FALSE);
+        else
+            win_append(oldwin->w_prev, wp);
+     }
+@@ -911,8 +906,15 @@
+        if (wp == NULL)
             return FAIL;
  
++       new_frame(wp);
++       if (wp->w_frame == NULL)
++       {
++           win_free(wp, NULL);
++           return FAIL;
++       }
++
         /* make the contents of the new window the same as the current one */
 -       win_init(wp, curwin);
@@ -22937 +25250 @@
  
      /*
-@@ -1161,11 +1159,14 @@
+@@ -971,13 +973,7 @@
+     }
+ 
+     if (newwin == NULL)
+-    {
+-       /* Create a frame for the new window. */
+-       frp = (frame_T *)alloc_clear((unsigned)sizeof(frame_T));
+-       frp->fr_layout = FR_LEAF;
+-       frp->fr_win = wp;
+-       wp->w_frame = frp;
+-    }
++       frp = wp->w_frame;
+     else
+        frp = newwin->w_frame;
+     frp->fr_parent = curfrp->fr_parent;
+@@ -1157,15 +1153,19 @@
+     return OK;
+ }
+ 
++
+ /*
   * Initialize window "newp" from window "oldp".
   * Used when splitting a window and when creating a new tab page.
@@ -22953 +25286 @@
      int                i;
  
-@@ -1190,7 +1191,14 @@
+@@ -1190,19 +1190,19 @@
      copy_jumplist(oldp, newp);
  #endif
@@ -22969 +25302 @@
      if (oldp->w_localdir != NULL)
         newp->w_localdir = vim_strsave(oldp->w_localdir);
-@@ -1258,11 +1266,10 @@
+ 
+-    /* Use the same argument list. */
+-    newp->w_alist = oldp->w_alist;
+-    ++newp->w_alist->al_refcount;
+-    newp->w_arg_idx = oldp->w_arg_idx;
+-
+-    /*
+-     * copy tagstack and options from existing window
+-     */
++    /* copy tagstack and folds */
+     for (i = 0; i < oldp->w_tagstacklen; i++)
+     {
+        newp->w_tagstack[i] = oldp->w_tagstack[i];
+@@ -1212,10 +1212,29 @@
+     }
+     newp->w_tagstackidx = oldp->w_tagstackidx;
+     newp->w_tagstacklen = oldp->w_tagstacklen;
+-    win_copy_options(oldp, newp);
+ # ifdef FEAT_FOLDING
+     copyFoldingState(oldp, newp);
+ # endif
++
++    win_init_some(newp, oldp);
++}
++
++/*
++ * Initialize window "newp" from window"old".
++ * Only the essential things are copied.
++ */
++    static void
++win_init_some(newp, oldp)
++    win_T      *newp;
++    win_T      *oldp;
++{
++    /* Use the same argument list. */
++    newp->w_alist = oldp->w_alist;
++    ++newp->w_alist->al_refcount;
++    newp->w_arg_idx = oldp->w_arg_idx;
++
++    /* copy options from existing window */
++    win_copy_options(oldp, newp);
+ }
+ 
+ #endif /* FEAT_WINDOWS */
+@@ -1258,11 +1277,10 @@
   * Must be called when there is just one window, filling the whole screen
   * (excluding the command line).
@@ -22982 +25359 @@
      int                maxcount;
      int                todo;
-@@ -2343,11 +2350,10 @@
+@@ -1557,15 +1575,8 @@
+ #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
+     /* When 'guioptions' includes 'L' or 'R' may have to remove or add
+      * scrollbars.  Have to update them anyway. */
+-    if (gui.in_use)
+-    {
+-       out_flush();
+-       gui_init_which_components(NULL);
+-       gui_update_scrollbars(TRUE);
+-    }
+-    need_mouse_correct = TRUE;
++    gui_may_update_scrollbars();
+ #endif
+-
+ }
+ 
+ /*
+@@ -2040,13 +2051,40 @@
+ }
+ 
+ /*
+- * Return TRUE if the current window is the only window that exists.
++ * Return TRUE if the current window is the only window that exists (ignoring
++ * "aucmd_win").
+  * Returns FALSE if there is a window, possibly in another tab page.
+  */
+     static int
+ last_window()
+ {
+-    return (lastwin == firstwin && first_tabpage->tp_next == NULL);
++    return (one_window() && first_tabpage->tp_next == NULL);
++}
++
++/*
++ * Return TRUE if there is only one window other than "aucmd_win" in the
++ * current tab page.
++ */
++    static int
++one_window()
++{
++#ifdef FEAT_AUTOCMD
++    win_T      *wp;
++    int                seen_one = FALSE;
++
++    FOR_ALL_WINDOWS(wp)
++    {
++       if (wp != aucmd_win)
++       {
++           if (seen_one)
++               return FALSE;
++           seen_one = TRUE;
++       }
++    }
++    return TRUE;
++#else
++    return firstwin == lastwin;
++#endif
+ }
+ 
+ /*
+@@ -2075,6 +2113,19 @@
+        return;
+     }
+ 
++#ifdef FEAT_AUTOCMD
++    if (win == aucmd_win)
++    {
++       EMSG(_("E813: Cannot close autocmd window"));
++       return;
++    }
++    if ((firstwin == aucmd_win || lastwin == aucmd_win) && one_window())
++    {
++       EMSG(_("E814: Cannot close window, only autocmd window would remain"));
++       return;
++    }
++#endif
++
+     /*
+      * When closing the last window in a tab page first go to another tab
+      * page and then close the window and the tab page.  This avoids that
+@@ -2104,7 +2155,7 @@
+     if (win->w_buffer->b_help)
+        help_window = TRUE;
+     else
+-       clear_snapshot(curtab);
++       clear_snapshot(curtab, SNAP_HELP_IDX);
+ 
+ #ifdef FEAT_AUTOCMD
+     if (win == curwin)
+@@ -2221,7 +2272,7 @@
+     /* After closing the help window, try restoring the window layout from
+      * before it was opened. */
+     if (help_window)
+-       restore_snapshot(close_curwin);
++       restore_snapshot(SNAP_HELP_IDX, close_curwin);
+ 
+ #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
+     /* When 'guioptions' includes 'L' or 'R' may have to remove scrollbars. */
+@@ -2302,13 +2353,6 @@
+     frame_T    *frp;
+     win_T      *wp;
+ 
+-#ifdef FEAT_FOLDING
+-    clearFolding(win);
+-#endif
+-
+-    /* reduce the reference count to the argument list. */
+-    alist_unlink(win->w_alist);
+-
+     /* Remove the window and its frame from the tree of frames. */
+     frp = win->w_frame;
+     wp = winframe_remove(win, dirp, tp);
+@@ -2334,6 +2378,14 @@
+        tabpage_close(TRUE);
+ # endif
+ 
++# ifdef FEAT_AUTOCMD
++    if (aucmd_win != NULL)
++    {
++       (void)win_free_mem(aucmd_win, &dummy, NULL);
++       aucmd_win = NULL;
++    }
++# endif
++
+     while (firstwin != NULL)
+        (void)win_free_mem(firstwin, &dummy, NULL);
+ }
+@@ -2343,11 +2395,10 @@
   * Remove a window and its frame from the tree of frames.
   * Returns a pointer to the window that got the freed up space.
   */
 -/*ARGSUSED*/
-     static win_T *
+-    static win_T *
++    win_T *
  winframe_remove(win, dirp, tp)
      win_T      *win;
@@ -22995 +25500 @@
  {
      frame_T    *frp, *frp2, *frp3;
-@@ -3220,7 +3226,7 @@
+@@ -3083,7 +3134,7 @@
+     win_T      *nextwp;
+     int                r;
+ 
+-    if (lastwin == firstwin)
++    if (one_window())
+     {
+        if (message
+ #ifdef FEAT_AUTOCMD
+@@ -3145,27 +3196,34 @@
+     void
+ curwin_init()
+ {
+-    redraw_win_later(curwin, NOT_VALID);
+-    curwin->w_lines_valid = 0;
+-    curwin->w_cursor.lnum = 1;
+-    curwin->w_curswant = curwin->w_cursor.col = 0;
++    win_init_empty(curwin);
++}
++
++    void
++win_init_empty(wp)
++    win_T *wp;
++{
++    redraw_win_later(wp, NOT_VALID);
++    wp->w_lines_valid = 0;
++    wp->w_cursor.lnum = 1;
++    wp->w_curswant = wp->w_cursor.col = 0;
+ #ifdef FEAT_VIRTUALEDIT
+-    curwin->w_cursor.coladd = 0;
++    wp->w_cursor.coladd = 0;
+ #endif
+-    curwin->w_pcmark.lnum = 1; /* pcmark not cleared but set to line 1 */
+-    curwin->w_pcmark.col = 0;
+-    curwin->w_prev_pcmark.lnum = 0;
+-    curwin->w_prev_pcmark.col = 0;
+-    curwin->w_topline = 1;
++    wp->w_pcmark.lnum = 1;     /* pcmark not cleared but set to line 1 */
++    wp->w_pcmark.col = 0;
++    wp->w_prev_pcmark.lnum = 0;
++    wp->w_prev_pcmark.col = 0;
++    wp->w_topline = 1;
+ #ifdef FEAT_DIFF
+-    curwin->w_topfill = 0;
++    wp->w_topfill = 0;
+ #endif
+-    curwin->w_botline = 2;
++    wp->w_botline = 2;
+ #ifdef FEAT_FKMAP
+-    if (curwin->w_p_rl)
+-       curwin->w_farsi = W_CONV + W_R_L;
++    if (wp->w_p_rl)
++       wp->w_farsi = W_CONV + W_R_L;
+     else
+-       curwin->w_farsi = W_CONV;
++       wp->w_farsi = W_CONV;
+ #endif
+ }
+ 
+@@ -3187,9 +3245,30 @@
+     first_tabpage->tp_topframe = topframe;
+     curtab = first_tabpage;
+ #endif
++
+     return OK;
+ }
+ 
++#if defined(FEAT_AUTOCMD) || defined(PROTO)
++/*
++ * Init "aucmd_win".  This can only be done after the first
++ * window is fully initialized, thus it can't be in win_alloc_first().
++ */
++    void
++win_alloc_aucmd_win()
++{
++    aucmd_win = win_alloc(NULL, TRUE);
++    if (aucmd_win != NULL)
++    {
++       win_init_some(aucmd_win, curwin);
++# ifdef FEAT_SCROLLBIND
++       aucmd_win->w_p_scb = FALSE;
++# endif
++       new_frame(aucmd_win);
++    }
++}
++#endif
++
+ /*
+  * Allocate the first window or the first window in a new tab page.
+  * When "oldwin" is NULL create an empty buffer for it.
+@@ -3201,7 +3280,7 @@
+ win_alloc_firstwin(oldwin)
+     win_T      *oldwin;
+ {
+-    curwin = win_alloc(NULL);
++    curwin = win_alloc(NULL, FALSE);
+     if (oldwin == NULL)
+     {
+        /* Very first window, need to create an empty buffer for it and
+@@ -3220,7 +3299,7 @@
      else
      {
@@ -23004 +25608 @@
  # ifdef FEAT_SCROLLBIND
         /* We don't want scroll-binding in the first window. */
-@@ -3490,10 +3496,9 @@
+@@ -3229,21 +3308,36 @@
+     }
+ #endif
+ 
+-    topframe = (frame_T *)alloc_clear((unsigned)sizeof(frame_T));
+-    if (topframe == NULL)
++    new_frame(curwin);
++    if (curwin->w_frame == NULL)
+        return FAIL;
+-    topframe->fr_layout = FR_LEAF;
++    topframe = curwin->w_frame;
+ #ifdef FEAT_VERTSPLIT
+     topframe->fr_width = Columns;
+ #endif
+     topframe->fr_height = Rows - p_ch;
+     topframe->fr_win = curwin;
+-    curwin->w_frame = topframe;
+ 
+     return OK;
+ }
+ 
+ /*
++ * Create a frame for window "wp".
++ */
++    static void
++new_frame(win_T *wp)
++{
++    frame_T *frp = (frame_T *)alloc_clear((unsigned)sizeof(frame_T));
++
++    wp->w_frame = frp;
++    if (frp != NULL)
++    {
++       frp->fr_layout = FR_LEAF;
++       frp->fr_win = wp;
++    }
++}
++
++/*
+  * Initialize the window and frame size to the maximum.
+  */
+     void
+@@ -3293,10 +3387,13 @@
+ free_tabpage(tp)
+     tabpage_T  *tp;
+ {
++    int idx;
++
+ # ifdef FEAT_DIFF
+     diff_clear(tp);
+ # endif
+-    clear_snapshot(tp);
++    for (idx = 0; idx < SNAP_COUNT; ++idx)
++       clear_snapshot(tp, idx);
+ #ifdef FEAT_EVAL
+     vars_clear(&tp->tp_vars.dv_hashtab);       /* free all t: variables */
+ #endif
+@@ -3363,12 +3460,7 @@
+ #if defined(FEAT_GUI)
+        /* When 'guioptions' includes 'L' or 'R' may have to remove or add
+         * scrollbars.  Have to update them anyway. */
+-       if (gui.in_use && starting == 0)
+-       {
+-           gui_init_which_components(NULL);
+-           gui_update_scrollbars(TRUE);
+-       }
+-       need_mouse_correct = TRUE;
++       gui_may_update_scrollbars();
+ #endif
+ 
+        redraw_all_later(CLEAR);
+@@ -3490,10 +3582,9 @@
   * FAIL.
   * Careful: When OK is returned need to get a new tab page very very soon!
@@ -23016 +25690 @@
  {
      tabpage_T  *tp = curtab;
-@@ -3535,11 +3540,10 @@
+@@ -3535,11 +3626,10 @@
   * Start using tab page "tp".
   * Only to be used after leave_tabpage() or freeing the current tab page.
@@ -23029 +25703 @@
      int                old_off = tp->tp_firstwin->w_winrow;
      win_T      *next_prevwin = tp->tp_prevwin;
-@@ -4028,14 +4032,14 @@
+@@ -3588,12 +3678,7 @@
+ #if defined(FEAT_GUI)
+     /* When 'guioptions' includes 'L' or 'R' may have to remove or add
+      * scrollbars.  Have to update them anyway. */
+-    if (gui.in_use && starting == 0)
+-    {
+-       gui_init_which_components(NULL);
+-       gui_update_scrollbars(TRUE);
+-    }
+-    need_mouse_correct = TRUE;
++    gui_may_update_scrollbars();
+ #endif
+ 
+     redraw_all_later(CLEAR);
+@@ -4028,14 +4113,14 @@
             if (mch_dirname(cwd, MAXPATHL) == OK)
                 globaldir = vim_strsave(cwd);
@@ -23047 +25735 @@
         globaldir = NULL;
         shorten_fnames(TRUE);
-@@ -4147,10 +4151,9 @@
- /*
-  * allocate a window structure and link it in the window list
+@@ -4145,12 +4230,13 @@
+ #endif
+ 
+ /*
+- * allocate a window structure and link it in the window list
++ * Allocate a window structure and link it in the window list when "hidden" is
++ * FALSE.
   */
 -/*ARGSUSED*/
      static win_T *
- win_alloc(after)
+-win_alloc(after)
 -    win_T      *after;
++win_alloc(after, hidden)
 +    win_T      *after UNUSED;
++    int                hidden UNUSED;
  {
      win_T      *newwin;
  
+@@ -4176,7 +4262,8 @@
+         * link the window in the window list
+         */
+ #ifdef FEAT_WINDOWS
+-       win_append(after, newwin);
++       if (!hidden)
++           win_append(after, newwin);
+ #endif
+ #ifdef FEAT_VERTSPLIT
+        newwin->w_wincol = 0;
+@@ -4237,6 +4324,13 @@
+ {
+     int                i;
+ 
++#ifdef FEAT_FOLDING
++    clearFolding(wp);
++#endif
++
++    /* reduce the reference count to the argument list. */
++    alist_unlink(wp->w_alist);
++
+ #ifdef FEAT_AUTOCMD
+     /* Don't execute autocommands while the window is halfway being deleted.
+      * gui_mch_destroy_scrollbar() may trigger a FocusGained event. */
+@@ -4299,7 +4393,10 @@
+     }
+ #endif /* FEAT_GUI */
+ 
+-    win_remove(wp, tp);
++#ifdef FEAT_AUTOCMD
++    if (wp != aucmd_win)
++#endif
++       win_remove(wp, tp);
+     vim_free(wp);
+ 
+ #ifdef FEAT_AUTOCMD
+@@ -4310,7 +4407,7 @@
+ /*
+  * Append window "wp" in the window list after window "after".
+  */
+-    static void
++    void
+ win_append(after, wp)
+     win_T      *after, *wp;
+ {
+@@ -4336,7 +4433,7 @@
+ /*
+  * Remove a window from the window list.
+  */
+-    static void
++    void
+ win_remove(wp, tp)
+     win_T      *wp;
+     tabpage_T  *tp;            /* tab page "win" is in, NULL for current */
+@@ -6036,6 +6133,7 @@
+ /*
+  * Return TRUE if there is only one window (in the current tab page), not
+  * counting a help or preview window, unless it is the current window.
++ * Does not count "aucmd_win".
+  */
+     int
+ only_one_window()
+@@ -6049,11 +6147,15 @@
+        return FALSE;
+ 
+     for (wp = firstwin; wp != NULL; wp = wp->w_next)
+-       if (!((wp->w_buffer->b_help && !curbuf->b_help)
++       if ((!((wp->w_buffer->b_help && !curbuf->b_help)
+ # ifdef FEAT_QUICKFIX
+                    || wp->w_p_pvw
+ # endif
+             ) || wp == curwin)
++# ifdef FEAT_AUTOCMD
++               && wp != aucmd_win
++# endif
++          )
+            ++count;
+     return (count <= 1);
+ #else
+@@ -6108,11 +6210,12 @@
+ /*
+  * Create a snapshot of the current frame sizes.
+  */
+-    static void
+-make_snapshot()
++    void
++make_snapshot(idx)
++    int idx;
+ {
+-    clear_snapshot(curtab);
+-    make_snapshot_rec(topframe, &curtab->tp_snapshot);
++    clear_snapshot(curtab, idx);
++    make_snapshot_rec(topframe, &curtab->tp_snapshot[idx]);
+ }
+ 
+     static void
+@@ -6140,11 +6243,12 @@
+  * Remove any existing snapshot.
+  */
+     static void
+-clear_snapshot(tp)
++clear_snapshot(tp, idx)
+     tabpage_T  *tp;
++    int                idx;
+ {
+-    clear_snapshot_rec(tp->tp_snapshot);
+-    tp->tp_snapshot = NULL;
++    clear_snapshot_rec(tp->tp_snapshot[idx]);
++    tp->tp_snapshot[idx] = NULL;
+ }
+ 
+     static void
+@@ -6164,26 +6268,27 @@
+  * This is only done if the screen size didn't change and the window layout is
+  * still the same.
+  */
+-    static void
+-restore_snapshot(close_curwin)
++    void
++restore_snapshot(idx, close_curwin)
++    int                idx;
+     int                close_curwin;       /* closing current window */
+ {
+     win_T      *wp;
+ 
+-    if (curtab->tp_snapshot != NULL
++    if (curtab->tp_snapshot[idx] != NULL
+ # ifdef FEAT_VERTSPLIT
+-           && curtab->tp_snapshot->fr_width == topframe->fr_width
++           && curtab->tp_snapshot[idx]->fr_width == topframe->fr_width
+ # endif
+-           && curtab->tp_snapshot->fr_height == topframe->fr_height
+-           && check_snapshot_rec(curtab->tp_snapshot, topframe) == OK)
++           && curtab->tp_snapshot[idx]->fr_height == topframe->fr_height
++           && check_snapshot_rec(curtab->tp_snapshot[idx], topframe) == OK)
+     {
+-       wp = restore_snapshot_rec(curtab->tp_snapshot, topframe);
++       wp = restore_snapshot_rec(curtab->tp_snapshot[idx], topframe);
+        win_comp_pos();
+        if (wp != NULL && close_curwin)
+            win_goto(wp);
+        redraw_all_later(CLEAR);
+     }
+-    clear_snapshot(curtab);
++    clear_snapshot(curtab, idx);
+ }
+ 
+ /*
 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-06-05 14:25:31.000000000 -0700
++++ vim72/src/workshop.c        2009-07-19 15:16:46.000000000 -0700
 @@ -204,12 +204,11 @@
   * Function:
@@ -23197 +26039 @@
  }
  
+diff -Naur vim72.orig/src/xxd/xxd.c vim72/src/xxd/xxd.c
+--- vim72.orig/src/xxd/xxd.c    2007-11-29 12:05:16.000000000 -0800
++++ vim72/src/xxd/xxd.c 2009-07-19 15:17:54.000000000 -0700
+@@ -64,6 +64,9 @@
+ # define _CRT_SECURE_NO_DEPRECATE
+ # define _CRT_NONSTDC_NO_DEPRECATE
+ #endif
++#if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__))
++# define CYGWIN
++#endif
+ 
+ #include <stdio.h>
+ #ifdef VAXC
+@@ -77,7 +80,8 @@
+ #if !defined(OS2) && defined(__EMX__)
+ # define OS2
+ #endif
+-#if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__)
++#if defined(MSDOS) || defined(WIN32) || defined(OS2) || defined(__BORLANDC__) \
++  || defined(CYGWIN)
+ # include <io.h>       /* for setmode() */
+ #else
+ # ifdef UNIX
+@@ -150,9 +154,6 @@
+ # endif
+ #endif
+ 
+-#if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__))
+-# define CYGWIN
+-#endif
+ #if defined(MSDOS) || defined(WIN32) || defined(OS2)
+ # define BIN_READ(yes)  ((yes) ? "rb" : "rt")
+ # define BIN_WRITE(yes) ((yes) ? "wb" : "wt")