Changeset bef6db9 in clfs-sysroot

Timestamp:

Jan 31, 2009, 6:51:46 AM (15 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

master

Children:

fbde836

Parents:

8fedadb

Message:

Update Patches.

File:

• patches/vim-7.2-branch_update-5.patch (moved) (moved from patches/vim-7.2-branch_update-3.patch) (97 diffs)

patches/vim-7.2-branch_update-5.patch

@@ -1 @@
-Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 12-30-2008
+Submitted By: Jim Gifford (jim at cross-lfs dot org)
+Date: 01-19-2009
 Initial Package Version: 7.2
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 7.2.076
+Description: Contains all upstream patches up to 7.2.084
              The following patches were skipped
              007 036 041 049 071 072 074
@@ -10 +10 @@
 diff -Naur vim72.orig/Filelist vim72/Filelist
 --- vim72.orig/Filelist 2008-07-06 11:02:23.000000000 -0700
-+++ vim72/Filelist      2008-12-30 16:15:18.000000000 -0800
++++ vim72/Filelist      2009-01-19 00:08:05.000000000 -0800
 @@ -285,6 +285,7 @@
                 src/proto/os_win32.pro \
@@ -21 +21 @@
 diff -Naur vim72.orig/runtime/doc/cmdline.txt vim72/runtime/doc/cmdline.txt
 --- vim72.orig/runtime/doc/cmdline.txt  2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/cmdline.txt       2008-12-30 16:15:47.000000000 -0800
++++ vim72/runtime/doc/cmdline.txt       2009-01-19 00:08:30.000000000 -0800
 @@ -1,4 +1,4 @@
 -*cmdline.txt*   For Vim version 7.2.  Last change: 2008 Jul 29
@@ -80 +80 @@
 diff -Naur vim72.orig/runtime/doc/eval.txt vim72/runtime/doc/eval.txt
 --- vim72.orig/runtime/doc/eval.txt     2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/eval.txt  2008-12-30 16:17:36.000000000 -0800
++++ vim72/runtime/doc/eval.txt  2009-01-19 00:10:10.000000000 -0800
 @@ -1,4 +1,4 @@
 -*eval.txt*     For Vim version 7.2.  Last change: 2008 Aug 09
@@ -198 +198 @@
  multi_lang             Compiled with support for multiple languages.
  mzscheme               Compiled with MzScheme interface |mzscheme|.
+diff -Naur vim72.orig/runtime/doc/netbeans.txt vim72/runtime/doc/netbeans.txt
+--- vim72.orig/runtime/doc/netbeans.txt 2008-08-09 07:22:59.000000000 -0700
++++ vim72/runtime/doc/netbeans.txt      2009-01-19 00:10:45.000000000 -0800
+@@ -1,4 +1,4 @@
+-*netbeans.txt*  For Vim version 7.2.  Last change: 2008 Jun 28
++*netbeans.txt*  For Vim version 7.2.  Last change: 2009 Jan 06
+ 
+ 
+                  VIM REFERENCE MANUAL    by Gordon Prieur et al.
+@@ -722,8 +722,10 @@
+                of the cursor.
+                New in version 2.1.
+ 
+-killed         A file was closed by the user.  Only for files that have been
+-               assigned a number by the IDE.
++killed         A file was deleted or wiped out by the user and the buffer
++               annotations have been removed.  The bufID number for this
++               buffer has become invalid.  Only for files that have been
++               assigned a bufID number by the IDE.
+ 
+ newDotAndMark off off
+                Reports the position of the cursor being at "off" bytes into
 diff -Naur vim72.orig/runtime/doc/options.txt vim72/runtime/doc/options.txt
 --- vim72.orig/runtime/doc/options.txt  2008-08-09 07:22:59.000000000 -0700
-+++ vim72/runtime/doc/options.txt       2008-12-30 16:16:50.000000000 -0800
++++ vim72/runtime/doc/options.txt       2009-01-19 00:09:28.000000000 -0800
 @@ -1,4 +1,4 @@
 -*options.txt*  For Vim version 7.2.  Last change: 2008 Aug 06
@@ -220 +242 @@
 diff -Naur vim72.orig/runtime/doc/spell.txt vim72/runtime/doc/spell.txt
 --- vim72.orig/runtime/doc/spell.txt    2008-08-09 07:23:00.000000000 -0700
-+++ vim72/runtime/doc/spell.txt 2008-12-30 16:17:18.000000000 -0800
++++ vim72/runtime/doc/spell.txt 2009-01-19 00:09:54.000000000 -0800
 @@ -1,4 +1,4 @@
 -*spell.txt*    For Vim version 7.2.  Last change: 2008 Jun 21
@@ -350 +372 @@
 diff -Naur vim72.orig/runtime/doc/starting.txt vim72/runtime/doc/starting.txt
 --- vim72.orig/runtime/doc/starting.txt 2008-08-09 07:23:00.000000000 -0700
-+++ vim72/runtime/doc/starting.txt      2008-12-30 16:15:47.000000000 -0800
++++ vim72/runtime/doc/starting.txt      2009-01-19 00:08:31.000000000 -0800
 @@ -1,4 +1,4 @@
 -*starting.txt*  For Vim version 7.2.  Last change: 2008 Jun 21
@@ -412 +434 @@
 diff -Naur vim72.orig/runtime/doc/usr_21.txt vim72/runtime/doc/usr_21.txt
 --- vim72.orig/runtime/doc/usr_21.txt   2008-08-09 07:23:01.000000000 -0700
-+++ vim72/runtime/doc/usr_21.txt        2008-12-30 16:15:47.000000000 -0800
++++ vim72/runtime/doc/usr_21.txt        2009-01-19 00:08:31.000000000 -0800
 @@ -1,4 +1,4 @@
 -*usr_21.txt*   For Vim version 7.2.  Last change: 2007 May 01
@@ -479 +501 @@
 diff -Naur vim72.orig/runtime/scripts.vim vim72/runtime/scripts.vim
 --- vim72.orig/runtime/scripts.vim      2008-08-08 15:27:21.000000000 -0700
-+++ vim72/runtime/scripts.vim   2008-12-30 16:14:26.000000000 -0800
++++ vim72/runtime/scripts.vim   2009-01-19 00:07:18.000000000 -0800
 @@ -234,6 +234,10 @@
    elseif s:line1 =~ '\<DTD\s\+XHTML\s'
@@ -493 +515 @@
 diff -Naur vim72.orig/src/auto/configure vim72/src/auto/configure
 --- vim72.orig/src/auto/configure       2008-07-24 05:40:36.000000000 -0700
-+++ vim72/src/auto/configure    2008-12-30 16:16:27.000000000 -0800
++++ vim72/src/auto/configure    2009-01-19 00:09:07.000000000 -0800
 @@ -16819,21 +16819,29 @@
    LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
@@ -534 +556 @@
 diff -Naur vim72.orig/src/buffer.c vim72/src/buffer.c
 --- vim72.orig/src/buffer.c     2008-08-06 04:00:48.000000000 -0700
-+++ vim72/src/buffer.c  2008-12-30 16:17:24.000000000 -0800
++++ vim72/src/buffer.c  2009-01-19 00:10:45.000000000 -0800
+@@ -437,10 +437,6 @@
+        return;
+ #endif
+ 
+-#ifdef FEAT_NETBEANS_INTG
+-    if (usingNetbeans)
+-       netbeans_file_closed(buf);
+-#endif
+     /* Change directories when the 'acd' option is set. */
+     DO_AUTOCHDIR
+ 
+@@ -639,6 +635,10 @@
+ #ifdef FEAT_SIGNS
+     buf_delete_signs(buf);             /* delete any signs */
+ #endif
++#ifdef FEAT_NETBEANS_INTG
++    if (usingNetbeans)
++        netbeans_file_killed(buf);
++#endif
+ #ifdef FEAT_LOCALMAP
+     map_clear_int(buf, MAP_ALL_MODES, TRUE, FALSE);  /* clear local mappings */
+     map_clear_int(buf, MAP_ALL_MODES, TRUE, TRUE);   /* clear local abbrevs */
 @@ -647,6 +647,9 @@
      vim_free(buf->b_start_fenc);
@@ -545 +589 @@
  
  /*
-@@ -1237,7 +1240,7 @@
+@@ -812,9 +815,6 @@
+     int                bnr;            /* buffer number */
+     char_u     *p;
+ 
+-#ifdef FEAT_NETBEANS_INTG
+-    netbeansCloseFile = 1;
+-#endif
+     if (addr_count == 0)
+     {
+        (void)do_buffer(command, DOBUF_CURRENT, FORWARD, 0, forceit);
+@@ -909,9 +909,6 @@
+        }
+     }
+ 
+-#ifdef FEAT_NETBEANS_INTG
+-    netbeansCloseFile = 0;
+-#endif
+ 
+     return errormsg;
+ }
+@@ -1237,7 +1234,7 @@
          * "buf" if one exists */
         if ((swb_flags & SWB_USEOPEN) && buf_jump_open_win(buf))
@@ -554 +618 @@
         if ((swb_flags & SWB_USETAB) && buf_jump_open_tab(buf))
             return OK;
-@@ -1351,11 +1354,12 @@
+@@ -1351,11 +1348,12 @@
         }
      }
@@ -570 +634 @@
  #endif
         enter_buffer(buf);
-@@ -1397,6 +1401,9 @@
+@@ -1397,6 +1395,9 @@
      curwin->w_cursor.coladd = 0;
  #endif
@@ -580 +644 @@
      /* Make sure the buffer is loaded. */
      if (curbuf->b_ml.ml_mfp == NULL)   /* need to load the file */
-@@ -1436,7 +1443,8 @@
+@@ -1436,7 +1437,8 @@
      maketitle();
  #endif
@@ -590 +654 @@
         scroll_cursor_halfway(FALSE);   /* redisplay at correct position */
  
-@@ -3963,7 +3971,7 @@
+@@ -3963,7 +3965,7 @@
      width = vim_strsize(out);
      if (maxwidth > 0 && width > maxwidth)
@@ -599 +663 @@
         if (itemcnt == 0)
             s = out;
-@@ -5062,7 +5070,7 @@
+@@ -5062,7 +5064,7 @@
      {
         if (buf->b_sfname != NULL)
@@ -610 +674 @@
 diff -Naur vim72.orig/src/configure.in vim72/src/configure.in
 --- vim72.orig/src/configure.in 2008-07-24 05:40:26.000000000 -0700
-+++ vim72/src/configure.in      2008-12-30 16:16:27.000000000 -0800
++++ vim72/src/configure.in      2009-01-19 00:09:07.000000000 -0800
 @@ -3152,18 +3152,25 @@
  dnl But only when making dependencies, cproto and lint don't take "-isystem".
@@ -645 +709 @@
 diff -Naur vim72.orig/src/diff.c vim72/src/diff.c
 --- vim72.orig/src/diff.c       2008-03-05 03:16:56.000000000 -0800
-+++ vim72/src/diff.c    2008-12-30 16:17:15.000000000 -0800
++++ vim72/src/diff.c    2009-01-19 00:09:50.000000000 -0800
 @@ -73,6 +73,8 @@
         {
@@ -733 +797 @@
      }
  #endif
+diff -Naur vim72.orig/src/edit.c vim72/src/edit.c
+--- vim72.orig/src/edit.c       2008-08-06 05:51:17.000000000 -0700
++++ vim72/src/edit.c    2009-01-19 00:10:48.000000000 -0800
+@@ -147,6 +147,7 @@
+ static int  ins_compl_bs __ARGS((void));
+ static void ins_compl_new_leader __ARGS((void));
+ static void ins_compl_addleader __ARGS((int c));
++static int ins_compl_len __ARGS((void));
+ static void ins_compl_restart __ARGS((void));
+ static void ins_compl_set_original_text __ARGS((char_u *str));
+ static void ins_compl_addfrommatch __ARGS((void));
+@@ -197,7 +198,8 @@
+ static void mb_replace_pop_ins __ARGS((int cc));
+ #endif
+ static void replace_flush __ARGS((void));
+-static void replace_do_bs __ARGS((void));
++static void replace_do_bs __ARGS((int limit_col));
++static int del_char_after_col __ARGS((int limit_col));
+ #ifdef FEAT_CINDENT
+ static int cindent_on __ARGS((void));
+ #endif
+@@ -1933,6 +1935,8 @@
+ /*
+  * Backspace the cursor until the given column.  Handles REPLACE and VREPLACE
+  * modes correctly.  May also be used when not in insert mode at all.
++ * Will attempt not to go before "col" even when there is a composing
++ * character.
+  */
+     void
+ backspace_until_column(col)
+@@ -1942,13 +1946,49 @@
+     {
+        curwin->w_cursor.col--;
+        if (State & REPLACE_FLAG)
+-           replace_do_bs();
+-       else
+-           (void)del_char(FALSE);
++           replace_do_bs(col);
++       else if (!del_char_after_col(col))
++           break;
+     }
+ }
+ #endif
+ 
++/*
++ * Like del_char(), but make sure not to go before column "limit_col".
++ * Only matters when there are composing characters.
++ * Return TRUE when something was deleted.
++ */
++   static int
++del_char_after_col(limit_col)
++    int limit_col;
++{
++#ifdef FEAT_MBYTE
++    if (enc_utf8 && limit_col >= 0)
++    {
++       int ecol = curwin->w_cursor.col + 1;
++
++       /* Make sure the cursor is at the start of a character, but
++        * skip forward again when going too far back because of a
++        * composing character. */
++       mb_adjust_cursor();
++       while (curwin->w_cursor.col < limit_col)
++       {
++           int l = utf_ptr2len(ml_get_cursor());
++
++           if (l == 0)  /* end of line */
++               break;
++           curwin->w_cursor.col += l;
++       }
++       if (*ml_get_cursor() == NUL || curwin->w_cursor.col == ecol)
++           return FALSE;
++       del_bytes((long)(ecol - curwin->w_cursor.col), FALSE, TRUE);
++    }
++    else
++#endif
++       (void)del_char(FALSE);
++    return TRUE;
++}
++
+ #if defined(FEAT_INS_EXPAND) || defined(PROTO)
+ /*
+  * CTRL-X pressed in Insert mode.
+@@ -2418,7 +2458,7 @@
+        {
+            had_match = (curwin->w_cursor.col > compl_col);
+            ins_compl_delete();
+-           ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
++           ins_bytes(compl_leader + ins_compl_len());
+            ins_redraw(FALSE);
+ 
+            /* When the match isn't there (to avoid matching itself) remove it
+@@ -2470,7 +2510,7 @@
+            *p = NUL;
+            had_match = (curwin->w_cursor.col > compl_col);
+            ins_compl_delete();
+-           ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
++           ins_bytes(compl_leader + ins_compl_len());
+            ins_redraw(FALSE);
+ 
+            /* When the match isn't there (to avoid matching itself) remove it
+@@ -3209,7 +3249,7 @@
+ {
+     ins_compl_del_pum();
+     ins_compl_delete();
+-    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
++    ins_bytes(compl_leader + ins_compl_len());
+     compl_used_match = FALSE;
+ 
+     if (compl_started)
+@@ -3264,6 +3304,20 @@
+ }
+ 
+ /*
++ * Return the length of the completion, from the completion start column to
++ * the cursor column.  Making sure it never goes below zero.
++ */
++    static int
++ins_compl_len()
++{
++    int off = curwin->w_cursor.col - compl_col;
++
++    if (off < 0)
++       return 0;
++    return off;
++}
++
++/*
+  * Append one character to the match leader.  May reduce the number of
+  * matches.
+  */
+@@ -3621,10 +3675,9 @@
+            {
+                ins_compl_delete();
+                if (compl_leader != NULL)
+-                   ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
++                   ins_bytes(compl_leader + ins_compl_len());
+                else if (compl_first_match != NULL)
+-                   ins_bytes(compl_orig_text
+-                                         + curwin->w_cursor.col - compl_col);
++                   ins_bytes(compl_orig_text + ins_compl_len());
+                retval = TRUE;
+            }
+ 
+@@ -4256,7 +4309,7 @@
+     static void
+ ins_compl_insert()
+ {
+-    ins_bytes(compl_shown_match->cp_str + curwin->w_cursor.col - compl_col);
++    ins_bytes(compl_shown_match->cp_str + ins_compl_len());
+     if (compl_shown_match->cp_flags & ORIGINAL_TEXT)
+        compl_used_match = FALSE;
+     else
+@@ -4425,7 +4478,7 @@
+        if (!compl_get_longest || compl_used_match)
+            ins_compl_insert();
+        else
+-           ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
++           ins_bytes(compl_leader + ins_compl_len());
+     }
+     else
+        compl_used_match = FALSE;
+@@ -7123,9 +7176,12 @@
+  * cc == 0: character was inserted, delete it
+  * cc > 0: character was replaced, put cc (first byte of original char) back
+  * and check for more characters to be put back
++ * When "limit_col" is >= 0, don't delete before this column.  Matters when
++ * using composing characters, use del_char_after_col() instead of del_char().
+  */
+     static void
+-replace_do_bs()
++replace_do_bs(limit_col)
++    int                limit_col;
+ {
+     int                cc;
+ #ifdef FEAT_VREPLACE
+@@ -7153,7 +7209,7 @@
+ #ifdef FEAT_MBYTE
+        if (has_mbyte)
+        {
+-           del_char(FALSE);
++           (void)del_char_after_col(limit_col);
+ # ifdef FEAT_VREPLACE
+            if (State & VREPLACE_FLAG)
+                orig_len = (int)STRLEN(ml_get_cursor());
+@@ -7203,7 +7259,7 @@
+        changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col);
+     }
+     else if (cc == 0)
+-       (void)del_char(FALSE);
++       (void)del_char_after_col(limit_col);
+ }
+ 
+ #ifdef FEAT_CINDENT
+@@ -8239,7 +8295,7 @@
+         * Replace mode */
+        if (curwin->w_cursor.lnum != Insstart.lnum
+                || curwin->w_cursor.col >= Insstart.col)
+-           replace_do_bs();
++           replace_do_bs(-1);
+     }
+     else
+        (void)del_char(FALSE);
+@@ -8556,7 +8612,7 @@
+                break;
+            }
+            if (State & REPLACE_FLAG)
+-               replace_do_bs();
++               replace_do_bs(-1);
+            else
+            {
+ #ifdef FEAT_MBYTE
 diff -Naur vim72.orig/src/eval.c vim72/src/eval.c
 --- vim72.orig/src/eval.c       2008-08-07 12:37:22.000000000 -0700
-+++ vim72/src/eval.c    2008-12-30 16:17:49.000000000 -0800
++++ vim72/src/eval.c    2009-01-19 00:10:21.000000000 -0800
 @@ -32,6 +32,9 @@
  
@@ -1559 +1835 @@
 diff -Naur vim72.orig/src/ex_cmds.c vim72/src/ex_cmds.c
 --- vim72.orig/src/ex_cmds.c    2008-08-04 12:15:00.000000000 -0700
-+++ vim72/src/ex_cmds.c 2008-12-30 16:17:03.000000000 -0800
++++ vim72/src/ex_cmds.c 2009-01-19 00:10:54.000000000 -0800
 @@ -24,7 +24,7 @@
  static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out));
@@ -1569 +1845 @@
  static int read_viminfo_up_to_marks __ARGS((vir_T *virp, int forceit, int writing));
  #endif
-@@ -1676,14 +1676,12 @@
+@@ -49,6 +49,7 @@
+     exarg_T    *eap;
+ {
+     int                c;
++    int                cval;
+     char       buf1[20];
+     char       buf2[20];
+     char_u     buf3[7];
+@@ -75,6 +76,10 @@
+     {
+        if (c == NL)        /* NUL is stored as NL */
+            c = NUL;
++       if (c == CAR && get_fileformat(curbuf) == EOL_MAC)
++           cval = NL;      /* NL is stored as CR */
++       else
++           cval = c;
+        if (vim_isprintc_strict(c) && (c < ' '
+ #ifndef EBCDIC
+                    || c > '~'
+@@ -94,7 +99,7 @@
+            buf2[0] = NUL;
+        vim_snprintf((char *)IObuff, IOSIZE,
+                _("<%s>%s%s  %d,  Hex %02x,  Octal %03o"),
+-                                          transchar(c), buf1, buf2, c, c, c);
++                                 transchar(c), buf1, buf2, cval, cval, cval);
+ #ifdef FEAT_MBYTE
+        if (enc_utf8)
+            c = cc[ci++];
+@@ -1676,14 +1681,12 @@
  
  /*
@@ -1588 +1892 @@
      FILE       *fp;
      char_u     *fname;
-@@ -1691,7 +1689,7 @@
+@@ -1691,7 +1694,7 @@
      if (no_viminfo())
         return FAIL;
@@ -1597 +1901 @@
         return FAIL;
      fp = mch_fopen((char *)fname, READBIN);
-@@ -1701,8 +1699,9 @@
+@@ -1701,8 +1704,9 @@
         verbose_enter();
         smsg((char_u *)_("Reading viminfo file \"%s\"%s%s%s"),
@@ -1609 +1913 @@
         verbose_leave();
      }
-@@ -1712,10 +1711,9 @@
+@@ -1712,10 +1716,9 @@
         return FAIL;
  
@@ -1621 +1925 @@
  }
  
-@@ -1943,7 +1941,7 @@
+@@ -1943,7 +1946,7 @@
              * root.
              */
@@ -1630 +1934 @@
         }
      }
-@@ -1968,7 +1966,7 @@
+@@ -1968,7 +1971,7 @@
      }
  
@@ -1639 +1943 @@
      fclose(fp_out);        /* errors are ignored !? */
      if (fp_in != NULL)
-@@ -2041,12 +2039,10 @@
+@@ -2041,12 +2044,10 @@
   * do_viminfo() -- Should only be called from read_viminfo() & write_viminfo().
   */
@@ -1654 +1958 @@
      int                count = 0;
      int                eof = FALSE;
-@@ -2061,8 +2057,9 @@
+@@ -2061,8 +2062,9 @@
  
      if (fp_in != NULL)
@@ -1666 +1970 @@
             /* Skip info, find start of marks */
             while (!(eof = viminfo_readline(&vir))
-@@ -2092,8 +2089,9 @@
+@@ -2092,8 +2094,9 @@
         write_viminfo_bufferlist(fp_out);
         count = write_viminfo_marks(fp_out);
@@ -1678 +1982 @@
      vim_free(vir.vir_line);
  #ifdef FEAT_MBYTE
-@@ -5059,6 +5057,7 @@
+@@ -5059,6 +5062,7 @@
  
             if (did_sub)
@@ -1688 +1992 @@
 diff -Naur vim72.orig/src/ex_cmds.h vim72/src/ex_cmds.h
 --- vim72.orig/src/ex_cmds.h    2008-06-21 11:47:57.000000000 -0700
-+++ vim72/src/ex_cmds.h 2008-12-30 16:15:47.000000000 -0800
++++ vim72/src/ex_cmds.h 2009-01-19 00:08:31.000000000 -0800
 @@ -278,7 +278,7 @@
  EX(CMD_crewind,                "crewind",      ex_cc,
@@ -1736 +2040 @@
 diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c
 --- vim72.orig/src/ex_cmds2.c   2008-07-13 09:18:22.000000000 -0700
-+++ vim72/src/ex_cmds2.c        2008-12-30 16:14:45.000000000 -0800
++++ vim72/src/ex_cmds2.c        2009-01-19 00:07:35.000000000 -0800
 @@ -3145,8 +3145,8 @@
         verbose_leave();
@@ -1750 +2054 @@
 diff -Naur vim72.orig/src/ex_docmd.c vim72/src/ex_docmd.c
 --- vim72.orig/src/ex_docmd.c   2008-07-26 04:51:05.000000000 -0700
-+++ vim72/src/ex_docmd.c        2008-12-30 16:17:40.000000000 -0800
++++ vim72/src/ex_docmd.c        2009-01-19 00:10:13.000000000 -0800
 @@ -364,6 +364,7 @@
  # define ex_function           ex_ni
@@ -1893 +2197 @@
 diff -Naur vim72.orig/src/ex_getln.c vim72/src/ex_getln.c
 --- vim72.orig/src/ex_getln.c   2008-08-08 02:31:33.000000000 -0700
-+++ vim72/src/ex_getln.c        2008-12-30 16:16:50.000000000 -0800
++++ vim72/src/ex_getln.c        2009-01-19 00:09:28.000000000 -0800
 @@ -31,6 +31,8 @@
      int                cmdattr;        /* attributes for prompt */
@@ -2027 +2331 @@
 diff -Naur vim72.orig/src/feature.h vim72/src/feature.h
 --- vim72.orig/src/feature.h    2008-08-06 04:00:39.000000000 -0700
-+++ vim72/src/feature.h 2008-12-30 16:15:47.000000000 -0800
++++ vim72/src/feature.h 2009-01-19 00:08:31.000000000 -0800
 @@ -767,9 +767,13 @@
  
@@ -2046 +2350 @@
 diff -Naur vim72.orig/src/fileio.c vim72/src/fileio.c
 --- vim72.orig/src/fileio.c     2008-08-06 04:01:03.000000000 -0700
-+++ vim72/src/fileio.c  2008-12-30 16:18:07.000000000 -0800
++++ vim72/src/fileio.c  2009-01-19 00:10:40.000000000 -0800
 @@ -932,7 +932,10 @@
      else
@@ -2131 +2435 @@
         } while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n');
      }
-@@ -6120,6 +6119,47 @@
+@@ -6107,12 +6106,24 @@
+ #ifdef HAVE_ACL
+     vim_acl_T  acl;            /* ACL from original file */
+ #endif
++#if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME)
++    int                use_tmp_file = FALSE;
++#endif
+ 
+     /*
+-     * When the names are identical, there is nothing to do.
++     * When the names are identical, there is nothing to do.  When they refer
++     * to the same file (ignoring case and slash/backslash differences) but
++     * the file name differs we need to go through a temp file.
+      */
+     if (fnamecmp(from, to) == 0)
+-       return 0;
++    {
++#ifdef CASE_INSENSITIVE_FILENAME
++       if (STRCMP(gettail(from), gettail(to)) != 0)
++           use_tmp_file = TRUE;
++       else
++#endif
++           return 0;
++    }
+ 
+     /*
+      * Fail if the "from" file doesn't exist.  Avoids that "to" is deleted.
+@@ -6120,6 +6131,55 @@
      if (mch_stat((char *)from, &st) < 0)
         return -1;
@@ -2138 +2469 @@
 +    {
 +       struct stat     st_to;
-+       char            tempname[MAXPATHL + 1];
 +
 +       /* It's possible for the source and destination to be the same file.
@@ -2146 +2476 @@
 +               && st.st_dev == st_to.st_dev
 +               && st.st_ino == st_to.st_ino)
++           use_tmp_file = TRUE;
++    }
++#endif
++
++#if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME)
++    if (use_tmp_file)
++    {
++       char    tempname[MAXPATHL + 1];
++
++       /*
++        * Find a name that doesn't exist and is in the same directory.
++        * Rename "from" to "tempname" and then rename "tempname" to "to".
++        */
++       if (STRLEN(from) >= MAXPATHL - 5)
++           return -1;
++       STRCPY(tempname, from);
++       for (n = 123; n < 99999; ++n)
 +       {
-+           /* Find a name that doesn't exist and is in the same directory.
-+            * Move "from" to "tempname" and then to "to". */
-+           if (STRLEN(from) >= MAXPATHL - 5)
-+               return -1;
-+           STRCPY(tempname, from);
-+           for (n = 123; n < 99999; ++n)
++           sprintf((char *)gettail((char_u *)tempname), "%d", n);
++           if (mch_stat(tempname, &st) < 0)
 +           {
-+               sprintf(gettail(tempname), "%d", n);
-+               if (mch_stat(tempname, &st_to) < 0)
++               if (mch_rename((char *)from, tempname) == 0)
 +               {
-+                   if (mch_rename((char *)from, tempname) == 0)
-+                   {
-+                       if (mch_rename(tempname, (char *)to) == 0)
-+                           return 0;
-+                       /* Strange, the second step failed.  Try moving the
-+                        * file back and return failure. */
-+                       mch_rename(tempname, (char *)from);
-+                       return -1;
-+                   }
-+                   /* If it fails for one temp name it will most likely fail
-+                    * for any temp name, give up. */
++                   if (mch_rename(tempname, (char *)to) == 0)
++                       return 0;
++                   /* Strange, the second step failed.  Try moving the
++                    * file back and return failure. */
++                   mch_rename(tempname, (char *)from);
 +                   return -1;
 +               }
++               /* If it fails for one temp name it will most likely fail
++                * for any temp name, give up. */
++               return -1;
 +           }
-+           return -1;
 +       }
++       return -1;
 +    }
 +#endif
@@ -2179 +2518 @@
       * Delete the "to" file, this is required on some systems to make the
       * mch_rename() work, on other systems it makes sure that we don't have
-@@ -8523,6 +8563,7 @@
+@@ -8523,6 +8583,7 @@
      char_u     *save_sourcing_name;
      linenr_T   save_sourcing_lnum;
@@ -2187 +2526 @@
      char_u     *save_autocmd_match;
      int                save_autocmd_busy;
-@@ -8601,6 +8642,7 @@
+@@ -8601,6 +8662,7 @@
       * Save the autocmd_* variables and info about the current buffer.
       */
@@ -2195 +2534 @@
      save_autocmd_match = autocmd_match;
      save_autocmd_busy = autocmd_busy;
-@@ -8618,14 +8660,15 @@
+@@ -8618,14 +8680,15 @@
         if (fname != NULL && *fname != NUL)
             autocmd_fname = fname;
@@ -2213 +2552 @@
      /*
       * Set the buffer number to be used for <abuf>.
-@@ -8810,6 +8853,7 @@
+@@ -8810,6 +8873,7 @@
      sourcing_lnum = save_sourcing_lnum;
      vim_free(autocmd_fname);
@@ -2221 +2560 @@
      autocmd_match = save_autocmd_match;
  #ifdef FEAT_EVAL
-@@ -8918,7 +8962,7 @@
+@@ -8918,7 +8982,7 @@
      {
         apc->curpat = NULL;
@@ -2230 +2569 @@
          * buffer number. */
         if (ap->pat != NULL && ap->cmds != NULL
-@@ -9104,7 +9148,7 @@
+@@ -9104,7 +9168,7 @@
  set_context_in_autocmd(xp, arg, doautocmd)
      expand_T   *xp;
@@ -2241 +2580 @@
 diff -Naur vim72.orig/src/fold.c vim72/src/fold.c
 --- vim72.orig/src/fold.c       2008-08-06 04:01:12.000000000 -0700
-+++ vim72/src/fold.c    2008-12-30 16:17:03.000000000 -0800
++++ vim72/src/fold.c    2009-01-19 00:10:42.000000000 -0800
 @@ -48,7 +48,7 @@
  static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));
@@ -2251 +2590 @@
  static linenr_T setManualFoldWin __ARGS((win_T *wp, linenr_T lnum, int opening, int recurse, int *donep));
  static void foldOpenNested __ARGS((fold_T *fpr));
-@@ -1241,10 +1241,10 @@
+@@ -740,7 +740,7 @@
+     garray_T   *found_ga;
+     fold_T     *found_fp = NULL;
+     linenr_T   found_off = 0;
+-    int                use_level = FALSE;
++    int                use_level;
+     int                maybe_small = FALSE;
+     int                level = 0;
+     linenr_T   lnum = start;
+@@ -757,6 +757,7 @@
+        gap = &curwin->w_folds;
+        found_ga = NULL;
+        lnum_off = 0;
++       use_level = FALSE;
+        for (;;)
+        {
+            if (!foldFind(gap, lnum - lnum_off, &fp))
+@@ -783,20 +784,21 @@
+        else
+        {
+            lnum = found_fp->fd_top + found_fp->fd_len + found_off;
+-           did_one = TRUE;
+ 
+            if (foldmethodIsManual(curwin))
+                deleteFoldEntry(found_ga,
+                    (int)(found_fp - (fold_T *)found_ga->ga_data), recursive);
+            else
+            {
+-               if (found_fp->fd_top + found_off < first_lnum)
+-                   first_lnum = found_fp->fd_top;
+-               if (lnum > last_lnum)
++               if (first_lnum > found_fp->fd_top + found_off)
++                   first_lnum = found_fp->fd_top + found_off;
++               if (last_lnum < lnum)
+                    last_lnum = lnum;
+-               parseMarker(curwin);
++               if (!did_one)
++                   parseMarker(curwin);
+                deleteFoldMarkers(found_fp, recursive, found_off);
+            }
++           did_one = TRUE;
+ 
+            /* redraw window */
+            changed_window_setting();
+@@ -811,6 +813,10 @@
+            redraw_curbuf_later(INVERTED);
+ #endif
+     }
++    else
++       /* Deleting markers may make cursor column invalid. */
++       check_cursor_col();
++
+     if (last_lnum > 0)
+        changed_lines(first_lnum, (colnr_T)0, last_lnum, 0L);
+ }
+@@ -1241,10 +1247,10 @@
   * Repeat "count" times.
   */
@@ -2264 +2658 @@
      int                done;
      long       n;
-@@ -1252,7 +1252,7 @@
+@@ -1252,7 +1258,7 @@
      for (n = 0; n < count; ++n)
      {
@@ -2275 +2669 @@
 diff -Naur vim72.orig/src/getchar.c vim72/src/getchar.c
 --- vim72.orig/src/getchar.c    2008-07-22 09:57:48.000000000 -0700
-+++ vim72/src/getchar.c 2008-12-30 16:16:59.000000000 -0800
++++ vim72/src/getchar.c 2009-01-19 00:09:36.000000000 -0800
 @@ -4702,7 +4702,7 @@
                         return FAIL;
@@ -2296 +2690 @@
 diff -Naur vim72.orig/src/globals.h vim72/src/globals.h
 --- vim72.orig/src/globals.h    2008-07-26 04:53:29.000000000 -0700
-+++ vim72/src/globals.h 2008-12-30 16:17:03.000000000 -0800
++++ vim72/src/globals.h 2009-01-19 00:10:45.000000000 -0800
 @@ -1022,6 +1022,7 @@
  #endif
@@ -2305 +2699 @@
  EXTERN char_u  *autocmd_match INIT(= NULL); /* name for <amatch> on cmdline */
  EXTERN int     did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */
-@@ -1548,6 +1549,14 @@
+@@ -1339,7 +1340,6 @@
+ 
+ #ifdef FEAT_NETBEANS_INTG
+ EXTERN char *netbeansArg INIT(= NULL); /* the -nb[:host:port:passwd] arg */
+-EXTERN int netbeansCloseFile INIT(= 0);        /* send killed if != 0 */
+ EXTERN int netbeansFireChanges INIT(= 1); /* send buffer changes if != 0 */
+ EXTERN int netbeansForcedQuit INIT(= 0);/* don't write modified files */
+ EXTERN int netbeansReadFile INIT(= 1); /* OK to read from disk if != 0 */
+@@ -1548,6 +1548,14 @@
  EXTERN time_t starttime;
  
@@ -2322 +2724 @@
 diff -Naur vim72.orig/src/gui.c vim72/src/gui.c
 --- vim72.orig/src/gui.c        2008-07-27 12:32:14.000000000 -0700
-+++ vim72/src/gui.c     2008-12-30 16:17:34.000000000 -0800
++++ vim72/src/gui.c     2009-01-19 00:10:07.000000000 -0800
 @@ -139,7 +139,7 @@
                 /* The read returns when the child closes the pipe (or when
@@ -2415 +2817 @@
 diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c
 --- vim72.orig/src/gui_at_sb.c  2004-06-07 07:32:25.000000000 -0700
-+++ vim72/src/gui_at_sb.c       2008-12-30 16:17:03.000000000 -0800
++++ vim72/src/gui_at_sb.c       2009-01-19 00:09:39.000000000 -0800
 @@ -1078,6 +1078,12 @@
      Cardinal   *num_params;    /* unused */
@@ -2441 +2843 @@
 diff -Naur vim72.orig/src/gui_gtk_x11.c vim72/src/gui_gtk_x11.c
 --- vim72.orig/src/gui_gtk_x11.c        2008-07-04 03:46:24.000000000 -0700
-+++ vim72/src/gui_gtk_x11.c     2008-12-30 16:17:03.000000000 -0800
++++ vim72/src/gui_gtk_x11.c     2009-01-19 00:09:39.000000000 -0800
 @@ -4070,14 +4070,14 @@
  
@@ -2465 +2867 @@
 diff -Naur vim72.orig/src/gui_x11.c vim72/src/gui_x11.c
 --- vim72.orig/src/gui_x11.c    2008-06-08 08:13:45.000000000 -0700
-+++ vim72/src/gui_x11.c 2008-12-30 16:15:59.000000000 -0800
++++ vim72/src/gui_x11.c 2009-01-19 00:08:42.000000000 -0800
 @@ -2450,7 +2450,7 @@
         *colorPtr = colortable[closest];
@@ -2477 +2879 @@
 diff -Naur vim72.orig/src/gui_xmdlg.c vim72/src/gui_xmdlg.c
 --- vim72.orig/src/gui_xmdlg.c  2008-06-21 09:05:32.000000000 -0700
-+++ vim72/src/gui_xmdlg.c       2008-12-30 16:17:03.000000000 -0800
++++ vim72/src/gui_xmdlg.c       2009-01-19 00:09:39.000000000 -0800
 @@ -369,10 +369,10 @@
      char       buf[TEMP_BUF_SIZE];
@@ -2633 +3035 @@
 diff -Naur vim72.orig/src/gui_xmebw.c vim72/src/gui_xmebw.c
 --- vim72.orig/src/gui_xmebw.c  2007-09-06 03:57:51.000000000 -0700
-+++ vim72/src/gui_xmebw.c       2008-12-30 16:17:03.000000000 -0800
++++ vim72/src/gui_xmebw.c       2009-01-19 00:09:39.000000000 -0800
 @@ -1256,7 +1256,7 @@
      }
@@ -2660 +3062 @@
 diff -Naur vim72.orig/src/if_cscope.c vim72/src/if_cscope.c
 --- vim72.orig/src/if_cscope.c  2008-06-24 09:32:34.000000000 -0700
-+++ vim72/src/if_cscope.c       2008-12-30 16:14:15.000000000 -0800
++++ vim72/src/if_cscope.c       2009-01-19 00:07:11.000000000 -0800
 @@ -74,7 +74,7 @@
      { "add",   cs_add,
@@ -2690 +3092 @@
 diff -Naur vim72.orig/src/if_cscope.h vim72/src/if_cscope.h
 --- vim72.orig/src/if_cscope.h  2007-09-02 07:51:08.000000000 -0700
-+++ vim72/src/if_cscope.h       2008-12-30 16:14:15.000000000 -0800
++++ vim72/src/if_cscope.h       2009-01-19 00:07:11.000000000 -0800
 @@ -42,17 +42,6 @@
   * f 7name     Find this file
@@ -2711 +3113 @@
 diff -Naur vim72.orig/src/if_perl.xs vim72/src/if_perl.xs
 --- vim72.orig/src/if_perl.xs   2008-07-17 13:55:09.000000000 -0700
-+++ vim72/src/if_perl.xs        2008-12-30 16:17:28.000000000 -0800
++++ vim72/src/if_perl.xs        2009-01-19 00:10:02.000000000 -0800
 @@ -136,6 +136,9 @@
  #  define Perl_newXS_flags dll_Perl_newXS_flags
@@ -2762 +3164 @@
 diff -Naur vim72.orig/src/if_python.c vim72/src/if_python.c
 --- vim72.orig/src/if_python.c  2008-07-17 14:09:32.000000000 -0700
-+++ vim72/src/if_python.c       2008-12-30 16:16:31.000000000 -0800
++++ vim72/src/if_python.c       2009-01-19 00:10:59.000000000 -0800
 @@ -531,6 +531,12 @@
         if (PythonMod_Init())
@@ -2776 +3178 @@
         Python_SaveThread();
  
-@@ -2345,7 +2351,8 @@
+@@ -1145,14 +1151,23 @@
+ 
+     /* Check if we run into a recursive loop.  The item must be in lookupDict
+      * then and we can use it again. */
+-    sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U, (long_u)our_tv);
+-    result = PyDict_GetItemString(lookupDict, ptrBuf);
+-    if (result != NULL)
+-       Py_INCREF(result);
+-    else if (our_tv->v_type == VAR_STRING)
++    if ((our_tv->v_type == VAR_LIST && our_tv->vval.v_list != NULL)
++           || (our_tv->v_type == VAR_DICT && our_tv->vval.v_dict != NULL))
++    {
++       sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U,
++               our_tv->v_type == VAR_LIST ? (long_u)our_tv->vval.v_list
++                                          : (long_u)our_tv->vval.v_dict);
++       result = PyDict_GetItemString(lookupDict, ptrBuf);
++       if (result != NULL)
++       {
++           Py_INCREF(result);
++           return result;
++       }
++    }
++
++    if (our_tv->v_type == VAR_STRING)
+     {
+        result = Py_BuildValue("s", our_tv->vval.v_string);
+-       PyDict_SetItemString(lookupDict, ptrBuf, result);
+     }
+     else if (our_tv->v_type == VAR_NUMBER)
+     {
+@@ -1161,7 +1176,6 @@
+        /* For backwards compatibility numbers are stored as strings. */
+        sprintf(buf, "%ld", (long)our_tv->vval.v_number);
+        result = Py_BuildValue("s", buf);
+-       PyDict_SetItemString(lookupDict, ptrBuf, result);
+     }
+ # ifdef FEAT_FLOAT
+     else if (our_tv->v_type == VAR_FLOAT)
+@@ -1170,7 +1184,6 @@
+ 
+        sprintf(buf, "%f", our_tv->vval.v_float);
+        result = Py_BuildValue("s", buf);
+-       PyDict_SetItemString(lookupDict, ptrBuf, result);
+     }
+ # endif
+     else if (our_tv->v_type == VAR_LIST)
+@@ -1179,10 +1192,11 @@
+        listitem_T      *curr;
+ 
+        result = PyList_New(0);
+-       PyDict_SetItemString(lookupDict, ptrBuf, result);
+ 
+        if (list != NULL)
+        {
++           PyDict_SetItemString(lookupDict, ptrBuf, result);
++
+            for (curr = list->lv_first; curr != NULL; curr = curr->li_next)
+            {
+                newObj = VimToPython(&curr->li_tv, depth + 1, lookupDict);
+@@ -1194,7 +1208,6 @@
+     else if (our_tv->v_type == VAR_DICT)
+     {
+        result = PyDict_New();
+-       PyDict_SetItemString(lookupDict, ptrBuf, result);
+ 
+        if (our_tv->vval.v_dict != NULL)
+        {
+@@ -1203,6 +1216,8 @@
+            hashitem_T  *hi;
+            dictitem_T  *di;
+ 
++           PyDict_SetItemString(lookupDict, ptrBuf, result);
++
+            for (hi = ht->ht_array; todo > 0; ++hi)
+            {
+                if (!HASHITEM_EMPTY(hi))
+@@ -2345,7 +2360,8 @@
  {
      PyObject *mod;
@@ -2788 +3266 @@
 diff -Naur vim72.orig/src/if_xcmdsrv.c vim72/src/if_xcmdsrv.c
 --- vim72.orig/src/if_xcmdsrv.c 2008-07-18 06:05:03.000000000 -0700
-+++ vim72/src/if_xcmdsrv.c      2008-12-30 16:16:09.000000000 -0800
++++ vim72/src/if_xcmdsrv.c      2009-01-19 00:08:50.000000000 -0800
 @@ -736,7 +736,7 @@
                 + serverReply.ga_len;
@@ -2818 +3296 @@
 diff -Naur vim72.orig/src/main.c vim72/src/main.c
 --- vim72.orig/src/main.c       2008-07-24 01:40:56.000000000 -0700
-+++ vim72/src/main.c    2008-12-30 16:17:03.000000000 -0800
++++ vim72/src/main.c    2009-01-19 00:09:39.000000000 -0800
 @@ -645,11 +645,12 @@
  
@@ -2880 +3358 @@
 diff -Naur vim72.orig/src/mark.c vim72/src/mark.c
 --- vim72.orig/src/mark.c       2008-08-08 15:06:49.000000000 -0700
-+++ vim72/src/mark.c    2008-12-30 16:15:47.000000000 -0800
++++ vim72/src/mark.c    2009-01-19 00:08:31.000000000 -0800
 @@ -1627,15 +1627,17 @@
  
@@ -2949 +3427 @@
 diff -Naur vim72.orig/src/mbyte.c vim72/src/mbyte.c
 --- vim72.orig/src/mbyte.c      2008-07-14 05:38:05.000000000 -0700
-+++ vim72/src/mbyte.c   2008-12-30 16:17:03.000000000 -0800
++++ vim72/src/mbyte.c   2009-01-19 00:09:39.000000000 -0800
 @@ -717,7 +717,7 @@
                      * where mblen() returns 0 for invalid character.
@@ -3031 +3509 @@
 diff -Naur vim72.orig/src/menu.c vim72/src/menu.c
 --- vim72.orig/src/menu.c       2008-06-21 12:53:43.000000000 -0700
-+++ vim72/src/menu.c    2008-12-30 16:14:07.000000000 -0800
++++ vim72/src/menu.c    2009-01-19 00:07:05.000000000 -0800
 @@ -1120,6 +1120,7 @@
         parent = menu;
@@ -3042 +3520 @@
 diff -Naur vim72.orig/src/message.c vim72/src/message.c
 --- vim72.orig/src/message.c    2008-07-09 11:24:55.000000000 -0700
-+++ vim72/src/message.c 2008-12-30 16:17:03.000000000 -0800
-@@ -4585,61 +4585,62 @@
++++ vim72/src/message.c 2009-01-19 00:10:51.000000000 -0800
+@@ -4556,7 +4556,13 @@
+                        remove_trailing_zeroes = TRUE;
+                    }
+ 
+-                   if (fmt_spec == 'f' && abs_f > 1.0e307)
++                   if (fmt_spec == 'f' &&
++#ifdef VAX
++                           abs_f > 1.0e38
++#else
++                           abs_f > 1.0e307
++#endif
++                           )
+                    {
+                        /* Avoid a buffer overflow */
+                        strcpy(tmp, "inf");
+@@ -4585,61 +4591,62 @@
                         if (remove_trailing_zeroes)
                         {
@@ -3129 +3622 @@
 diff -Naur vim72.orig/src/misc1.c vim72/src/misc1.c
 --- vim72.orig/src/misc1.c      2008-07-12 12:20:53.000000000 -0700
-+++ vim72/src/misc1.c   2008-12-30 16:15:47.000000000 -0800
++++ vim72/src/misc1.c   2009-01-19 00:08:31.000000000 -0800
 @@ -3245,9 +3245,9 @@
  
@@ -3144 +3637 @@
 diff -Naur vim72.orig/src/misc2.c vim72/src/misc2.c
 --- vim72.orig/src/misc2.c      2008-07-23 12:12:56.000000000 -0700
-+++ vim72/src/misc2.c   2008-12-30 16:17:58.000000000 -0800
++++ vim72/src/misc2.c   2009-01-19 00:10:29.000000000 -0800
 @@ -873,7 +873,7 @@
             /* 3. check for available memory: call mch_avail_mem() */
@@ -3215 +3708 @@
 diff -Naur vim72.orig/src/move.c vim72/src/move.c
 --- vim72.orig/src/move.c       2008-07-12 09:26:47.000000000 -0700
-+++ vim72/src/move.c    2008-12-30 16:16:21.000000000 -0800
++++ vim72/src/move.c    2009-01-19 00:09:02.000000000 -0800
 @@ -280,18 +280,20 @@
  
@@ -3265 +3758 @@
 diff -Naur vim72.orig/src/netbeans.c vim72/src/netbeans.c
 --- vim72.orig/src/netbeans.c   2008-07-13 09:19:54.000000000 -0700
-+++ vim72/src/netbeans.c        2008-12-30 16:17:03.000000000 -0800
++++ vim72/src/netbeans.c        2009-01-19 00:10:45.000000000 -0800
 @@ -1043,7 +1043,7 @@
         nbdebug(("EVT: %s", buf));
@@ -3301 +3794 @@
                 nbdebug(("    partial line annotation -- Not Yet Implemented!\n"));
             }
+@@ -2924,44 +2918,26 @@
+ }
+ 
+ /*
+- * Tell netbeans a file was closed.
++ * Tell netbeans that a file was deleted or wiped out.
+  */
+     void
+-netbeans_file_closed(buf_T *bufp)
++netbeans_file_killed(buf_T *bufp)
+ {
+     int                bufno = nb_getbufno(bufp);
+     nbbuf_T    *nbbuf = nb_get_buf(bufno);
+     char       buffer[2*MAXPATHL];
+ 
+-    if (!haveConnection || bufno < 0)
+-       return;
+-
+-    if (!netbeansCloseFile)
+-    {
+-       nbdebug(("Ignoring file_closed for %s. File was closed from IDE\n",
+-                   bufp->b_ffname));
++    if (!haveConnection || bufno == -1)
+        return;
+-    }
+-
+-    nbdebug(("netbeans_file_closed:\n"));
+-    nbdebug(("    Closing bufno: %d", bufno));
+-    if (curbuf != NULL && curbuf != bufp)
+-    {
+-       nbdebug(("    Curbuf bufno:  %d\n", nb_getbufno(curbuf)));
+-    }
+-    else if (curbuf == bufp)
+-    {
+-       nbdebug(("    curbuf == bufp\n"));
+-    }
+ 
+-    if (bufno <= 0)
+-       return;
++    nbdebug(("netbeans_file_killed:\n"));
++    nbdebug(("    Killing bufno: %d", bufno));
+ 
+     sprintf(buffer, "%d:killed=%d\n", bufno, r_cmdno);
+ 
+     nbdebug(("EVT: %s", buffer));
+ 
+-    nb_send(buffer, "netbeans_file_closed");
++    nb_send(buffer, "netbeans_file_killed");
+ 
+     if (nbbuf != NULL)
+        nbbuf->bufp = NULL;
 diff -Naur vim72.orig/src/normal.c vim72/src/normal.c
 --- vim72.orig/src/normal.c     2008-07-31 13:03:08.000000000 -0700
-+++ vim72/src/normal.c  2008-12-30 16:16:40.000000000 -0800
++++ vim72/src/normal.c  2009-01-19 00:09:18.000000000 -0800
 @@ -183,6 +183,8 @@
  static void    nv_cursorhold __ARGS((cmdarg_T *cap));
@@ -3491 +4035 @@
 diff -Naur vim72.orig/src/ops.c vim72/src/ops.c
 --- vim72.orig/src/ops.c        2008-06-21 13:08:59.000000000 -0700
-+++ vim72/src/ops.c     2008-12-30 16:17:30.000000000 -0800
++++ vim72/src/ops.c     2009-01-19 00:10:04.000000000 -0800
 @@ -2209,12 +2209,15 @@
      {
@@ -3512 +4056 @@
 diff -Naur vim72.orig/src/option.c vim72/src/option.c
 --- vim72.orig/src/option.c     2008-07-18 06:05:33.000000000 -0700
-+++ vim72/src/option.c  2008-12-30 16:17:58.000000000 -0800
++++ vim72/src/option.c  2009-01-19 00:10:29.000000000 -0800
 @@ -2593,13 +2593,13 @@
  #ifdef FEAT_VIMINFO
@@ -3570 +4114 @@
 diff -Naur vim72.orig/src/os_unix.c vim72/src/os_unix.c
 --- vim72.orig/src/os_unix.c    2008-08-06 04:01:40.000000000 -0700
-+++ vim72/src/os_unix.c 2008-12-30 16:17:03.000000000 -0800
++++ vim72/src/os_unix.c 2009-01-19 00:09:40.000000000 -0800
 @@ -315,12 +315,15 @@
      {-1,           "Unknown!", FALSE}
@@ -3684 +4228 @@
 diff -Naur vim72.orig/src/proto/eval.pro vim72/src/proto/eval.pro
 --- vim72.orig/src/proto/eval.pro       2008-08-09 07:31:25.000000000 -0700
-+++ vim72/src/proto/eval.pro    2008-12-30 16:16:40.000000000 -0800
++++ vim72/src/proto/eval.pro    2009-01-19 00:09:18.000000000 -0800
 @@ -17,7 +17,7 @@
  int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip));
@@ -3726 +4270 @@
 diff -Naur vim72.orig/src/proto/ex_cmds.pro vim72/src/proto/ex_cmds.pro
 --- vim72.orig/src/proto/ex_cmds.pro    2008-08-09 07:31:25.000000000 -0700
-+++ vim72/src/proto/ex_cmds.pro 2008-12-30 16:15:47.000000000 -0800
++++ vim72/src/proto/ex_cmds.pro 2009-01-19 00:08:31.000000000 -0800
 @@ -11,7 +11,7 @@
  char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
@@ -3738 +4282 @@
 diff -Naur vim72.orig/src/proto/ex_getln.pro vim72/src/proto/ex_getln.pro
 --- vim72.orig/src/proto/ex_getln.pro   2008-08-09 07:31:28.000000000 -0700
-+++ vim72/src/proto/ex_getln.pro        2008-12-30 16:16:50.000000000 -0800
++++ vim72/src/proto/ex_getln.pro        2009-01-19 00:09:28.000000000 -0800
 @@ -31,7 +31,7 @@
  void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col));
@@ -3750 +4294 @@
 diff -Naur vim72.orig/src/proto/mark.pro vim72/src/proto/mark.pro
 --- vim72.orig/src/proto/mark.pro       2008-08-09 07:31:36.000000000 -0700
-+++ vim72/src/proto/mark.pro    2008-12-30 16:15:47.000000000 -0800
++++ vim72/src/proto/mark.pro    2009-01-19 00:08:31.000000000 -0800
 @@ -26,5 +26,5 @@
  void write_viminfo_filemarks __ARGS((FILE *fp));
@@ -3760 +4304 @@
 diff -Naur vim72.orig/src/proto/misc2.pro vim72/src/proto/misc2.pro
 --- vim72.orig/src/proto/misc2.pro      2008-08-09 07:31:40.000000000 -0700
-+++ vim72/src/proto/misc2.pro   2008-12-30 16:17:58.000000000 -0800
++++ vim72/src/proto/misc2.pro   2009-01-19 00:10:29.000000000 -0800
 @@ -59,7 +59,7 @@
  int handle_x_keys __ARGS((int key));
@@ -3770 +4314 @@
  int find_special_key_in_table __ARGS((int c));
  int get_special_key_code __ARGS((char_u *name));
+diff -Naur vim72.orig/src/proto/netbeans.pro vim72/src/proto/netbeans.pro
+--- vim72.orig/src/proto/netbeans.pro   2008-08-09 07:31:56.000000000 -0700
++++ vim72/src/proto/netbeans.pro        2009-01-19 00:10:45.000000000 -0800
+@@ -11,7 +11,7 @@
+ void netbeans_frame_moved __ARGS((int new_x, int new_y));
+ void netbeans_file_activated __ARGS((buf_T *bufp));
+ void netbeans_file_opened __ARGS((buf_T *bufp));
+-void netbeans_file_closed __ARGS((buf_T *bufp));
++void netbeans_file_killed __ARGS((buf_T *bufp));
+ void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen));
+ void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len));
+ void netbeans_unmodified __ARGS((buf_T *bufp));
 diff -Naur vim72.orig/src/pty.c vim72/src/pty.c
 --- vim72.orig/src/pty.c        2008-06-21 11:52:58.000000000 -0700
-+++ vim72/src/pty.c     2008-12-30 16:14:03.000000000 -0800
++++ vim72/src/pty.c     2009-01-19 00:07:02.000000000 -0800
 @@ -270,9 +270,10 @@
  }
@@ -3788 +4344 @@
 diff -Naur vim72.orig/src/screen.c vim72/src/screen.c
 --- vim72.orig/src/screen.c     2008-07-24 07:45:07.000000000 -0700
-+++ vim72/src/screen.c  2008-12-30 16:15:21.000000000 -0800
++++ vim72/src/screen.c  2009-01-19 00:08:07.000000000 -0800
 @@ -2439,9 +2439,17 @@
  
@@ -3812 +4368 @@
 diff -Naur vim72.orig/src/spell.c vim72/src/spell.c
 --- vim72.orig/src/spell.c      2008-07-12 12:20:55.000000000 -0700
-+++ vim72/src/spell.c   2008-12-30 16:17:46.000000000 -0800
++++ vim72/src/spell.c   2009-01-19 00:10:18.000000000 -0800
 @@ -77,7 +77,7 @@
  
@@ -4647 +5203 @@
 diff -Naur vim72.orig/src/structs.h vim72/src/structs.h
 --- vim72.orig/src/structs.h    2008-07-30 13:02:50.000000000 -0700
-+++ vim72/src/structs.h 2008-12-30 16:16:21.000000000 -0800
++++ vim72/src/structs.h 2009-01-19 00:09:02.000000000 -0800
 @@ -459,7 +459,7 @@
  typedef struct
@@ -4676 +5232 @@
 diff -Naur vim72.orig/src/tag.c vim72/src/tag.c
 --- vim72.orig/src/tag.c        2008-07-16 14:31:30.000000000 -0700
-+++ vim72/src/tag.c     2008-12-30 16:17:42.000000000 -0800
++++ vim72/src/tag.c     2009-01-19 00:10:57.000000000 -0800
+@@ -515,7 +515,7 @@
+             * If a count is supplied to the ":tag <name>" command, then
+             * jump to count'th matching tag.
+             */
+-           if (type == DT_TAG && count > 0)
++           if (type == DT_TAG && *tag != NUL && count > 0)
+                cur_match = count - 1;
+ 
+            if (type == DT_SELECT || type == DT_JUMP
 @@ -2725,7 +2725,24 @@
          */
@@ -4722 +5287 @@
 diff -Naur vim72.orig/src/testdir/Make_ming.mak vim72/src/testdir/Make_ming.mak
 --- vim72.orig/src/testdir/Make_ming.mak        1969-12-31 16:00:00.000000000 -0800
-+++ vim72/src/testdir/Make_ming.mak     2008-12-30 16:15:18.000000000 -0800
++++ vim72/src/testdir/Make_ming.mak     2009-01-19 00:08:05.000000000 -0800
 @@ -0,0 +1,91 @@
 +# Makefile to run tests for Vim, on Dos-like machines
@@ -4817 +5382 @@
 diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile
 --- vim72.orig/src/testdir/Makefile     2008-06-19 13:29:46.000000000 -0700
-+++ vim72/src/testdir/Makefile  2008-12-30 16:14:55.000000000 -0800
++++ vim72/src/testdir/Makefile  2009-01-19 00:07:44.000000000 -0800
 @@ -26,15 +26,17 @@
  
@@ -4851 +5416 @@
 diff -Naur vim72.orig/src/testdir/test42.ok vim72/src/testdir/test42.ok
 --- vim72.orig/src/testdir/test42.ok    2008-02-20 04:27:37.000000000 -0800
-+++ vim72/src/testdir/test42.ok 2008-12-30 16:15:53.000000000 -0800
++++ vim72/src/testdir/test42.ok 2009-01-19 00:08:36.000000000 -0800
 @@ -20,7 +20,7 @@
  ucs-2
@@ -4863 +5428 @@
 diff -Naur vim72.orig/src/ui.c vim72/src/ui.c
 --- vim72.orig/src/ui.c 2008-07-14 11:14:56.000000000 -0700
-+++ vim72/src/ui.c      2008-12-30 16:17:03.000000000 -0800
++++ vim72/src/ui.c      2009-01-19 00:09:40.000000000 -0800
 @@ -1820,7 +1820,7 @@
  #ifdef HAVE_DUP
@@ -4971 +5536 @@
 diff -Naur vim72.orig/src/version.c vim72/src/version.c
 --- vim72.orig/src/version.c    2008-08-09 07:24:52.000000000 -0700
-+++ vim72/src/version.c 2008-12-30 16:18:07.000000000 -0800
-@@ -677,9 +677,160 @@
++++ vim72/src/version.c 2009-01-19 00:10:59.000000000 -0800
+@@ -677,9 +677,176 @@
  static int included_patches[] =
  {   /* Add new patch number below this line */
  /**/
++    84,
++/**/
++    83,
++/**/
++    82,
++/**/
++    81,
++/**/
++    80,
++/**/
++    79,
++/**/
++    78,
++/**/
++    77,
++/**/
 +    76,
 +/**/
@@ -5133 +5714 @@
  highest_patch()
  {
-@@ -786,7 +937,7 @@
+@@ -786,7 +953,7 @@
      MSG_PUTS(_("\nRISC OS version"));
  #endif
@@ -5142 +5723 @@
      if (*compiled_arch != NUL)
      {
-@@ -825,6 +976,19 @@
+@@ -825,6 +992,19 @@
         }
      }
@@ -5164 +5745 @@
 diff -Naur vim72.orig/src/vim.h vim72/src/vim.h
 --- vim72.orig/src/vim.h        2008-08-09 09:03:38.000000000 -0700
-+++ vim72/src/vim.h     2008-12-30 16:16:37.000000000 -0800
++++ vim72/src/vim.h     2009-01-19 00:09:15.000000000 -0800
 @@ -341,8 +341,14 @@
  #ifdef BACKSLASH_IN_FILENAME
@@ -5224 +5805 @@
 diff -Naur vim72.orig/src/window.c vim72/src/window.c
 --- vim72.orig/src/window.c     2008-08-06 04:00:30.000000000 -0700
-+++ vim72/src/window.c  2008-12-30 16:17:03.000000000 -0800
++++ vim72/src/window.c  2009-01-19 00:09:40.000000000 -0800
 @@ -4028,14 +4028,14 @@
             if (mch_dirname(cwd, MAXPATHL) == OK)
@@ -5245 +5826 @@
 diff -Naur vim72.orig/src/workshop.c vim72/src/workshop.c
 --- vim72.orig/src/workshop.c   2008-06-21 11:53:26.000000000 -0700
-+++ vim72/src/workshop.c        2008-12-30 16:16:56.000000000 -0800
++++ vim72/src/workshop.c        2009-01-19 00:09:33.000000000 -0800
 @@ -1121,8 +1121,12 @@
                                       ? (char *)curbuf->b_sfname : "<None>");