Changeset 9a875fd


Ignore:
Timestamp:
Feb 7, 2009, 10:22:38 PM (12 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
a28f18d
Parents:
c056224
Message:

Updated Vim Branch Update Patch to -7

Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • BOOK/introduction/common/changelog.xml

    rc056224 r9a875fd  
    4545        <listitem>
    4646          <para>[Jim] - Updated Ncurses Branch Update Patch to -7.</para>
     47        </listitem>
     48        <listitem>
     49          <para>[Jim] - Updated Vim Branch Update Patch to -7.</para>
    4750        </listitem>
    4851      </itemizedlist>
  • BOOK/patches.ent

    rc056224 r9a875fd  
    125125<!ENTITY tar-revert_pipe_drain-patch-size "4 KB">
    126126
    127 <!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-6.patch">
    128 <!ENTITY vim-branch_update-patch-md5 "2cb86afc95be5becb82028614a961d2e">
    129 <!ENTITY vim-branch_update-patch-size "184 KB">
     127<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-7.patch">
     128<!ENTITY vim-branch_update-patch-md5 "2296ce9262b79c6fa8e8834ff1f6d554">
     129<!ENTITY vim-branch_update-patch-size "192 KB">
    130130
    131131<!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">
  • patches/vim-7.2-branch_update-7.patch

    rc056224 r9a875fd  
    11Submitted By: Jim Gifford (jim at cross-lfs dot org)
    2 Date: 01-31-2009
     2Date: 02-07-2009
    33Initial Package Version: 7.2
    44Origin: Upstream
    55Upstream Status: Applied
    6 Description: Contains all upstream patches up to 7.2.093
     6Description: Contains all upstream patches up to 7.2.102
    77             The following patches were skipped
    8              007 036 041 049 071 072 074 088 089 093
     8             007 036 041 049 071 072 074 088 089 093 101
    99
    1010diff -Naur vim72.orig/Filelist vim72/Filelist
    1111--- vim72.orig/Filelist 2008-07-06 11:02:23.000000000 -0700
    12 +++ vim72/Filelist      2009-01-31 15:33:59.649856405 -0800
     12+++ vim72/Filelist      2009-02-07 22:14:24.920315687 -0800
    1313@@ -285,6 +285,7 @@
    1414                src/proto/os_win32.pro \
     
    2121diff -Naur vim72.orig/runtime/doc/cmdline.txt vim72/runtime/doc/cmdline.txt
    2222--- vim72.orig/runtime/doc/cmdline.txt  2008-08-09 07:22:59.000000000 -0700
    23 +++ vim72/runtime/doc/cmdline.txt       2009-01-31 15:34:23.083470597 -0800
     23+++ vim72/runtime/doc/cmdline.txt       2009-02-07 22:14:49.082537505 -0800
    2424@@ -1,4 +1,4 @@
    2525-*cmdline.txt*   For Vim version 7.2.  Last change: 2008 Jul 29
     
    8080diff -Naur vim72.orig/runtime/doc/eval.txt vim72/runtime/doc/eval.txt
    8181--- vim72.orig/runtime/doc/eval.txt     2008-08-09 07:22:59.000000000 -0700
    82 +++ vim72/runtime/doc/eval.txt  2009-01-31 15:35:55.361836011 -0800
     82+++ vim72/runtime/doc/eval.txt  2009-02-07 22:16:31.313639335 -0800
    8383@@ -1,4 +1,4 @@
    8484-*eval.txt*     For Vim version 7.2.  Last change: 2008 Aug 09
     
    200200diff -Naur vim72.orig/runtime/doc/netbeans.txt vim72/runtime/doc/netbeans.txt
    201201--- vim72.orig/runtime/doc/netbeans.txt 2008-08-09 07:22:59.000000000 -0700
    202 +++ vim72/runtime/doc/netbeans.txt      2009-01-31 15:36:29.096162872 -0800
     202+++ vim72/runtime/doc/netbeans.txt      2009-02-07 22:17:10.442415701 -0800
    203203@@ -1,4 +1,4 @@
    204204-*netbeans.txt*  For Vim version 7.2.  Last change: 2008 Jun 28
     
    222222diff -Naur vim72.orig/runtime/doc/options.txt vim72/runtime/doc/options.txt
    223223--- vim72.orig/runtime/doc/options.txt  2008-08-09 07:22:59.000000000 -0700
    224 +++ vim72/runtime/doc/options.txt       2009-01-31 15:35:15.943118033 -0800
     224+++ vim72/runtime/doc/options.txt       2009-02-07 22:15:46.012035201 -0800
    225225@@ -1,4 +1,4 @@
    226226-*options.txt*  For Vim version 7.2.  Last change: 2008 Aug 06
     
    242242diff -Naur vim72.orig/runtime/doc/spell.txt vim72/runtime/doc/spell.txt
    243243--- vim72.orig/runtime/doc/spell.txt    2008-08-09 07:23:00.000000000 -0700
    244 +++ vim72/runtime/doc/spell.txt 2009-01-31 15:35:40.064779160 -0800
     244+++ vim72/runtime/doc/spell.txt 2009-02-07 22:16:14.222486660 -0800
    245245@@ -1,4 +1,4 @@
    246246-*spell.txt*    For Vim version 7.2.  Last change: 2008 Jun 21
     
    372372diff -Naur vim72.orig/runtime/doc/starting.txt vim72/runtime/doc/starting.txt
    373373--- vim72.orig/runtime/doc/starting.txt 2008-08-09 07:23:00.000000000 -0700
    374 +++ vim72/runtime/doc/starting.txt      2009-01-31 15:34:23.087472832 -0800
     374+++ vim72/runtime/doc/starting.txt      2009-02-07 22:14:49.086641151 -0800
    375375@@ -1,4 +1,4 @@
    376376-*starting.txt*  For Vim version 7.2.  Last change: 2008 Jun 21
     
    434434diff -Naur vim72.orig/runtime/doc/usr_21.txt vim72/runtime/doc/usr_21.txt
    435435--- vim72.orig/runtime/doc/usr_21.txt   2008-08-09 07:23:01.000000000 -0700
    436 +++ vim72/runtime/doc/usr_21.txt        2009-01-31 15:34:23.087472832 -0800
     436+++ vim72/runtime/doc/usr_21.txt        2009-02-07 22:14:49.086641151 -0800
    437437@@ -1,4 +1,4 @@
    438438-*usr_21.txt*   For Vim version 7.2.  Last change: 2007 May 01
     
    501501diff -Naur vim72.orig/runtime/scripts.vim vim72/runtime/scripts.vim
    502502--- vim72.orig/runtime/scripts.vim      2008-08-08 15:27:21.000000000 -0700
    503 +++ vim72/runtime/scripts.vim   2009-01-31 15:33:15.442805979 -0800
     503+++ vim72/runtime/scripts.vim   2009-02-07 22:13:32.395881827 -0800
    504504@@ -234,6 +234,10 @@
    505505   elseif s:line1 =~ '\<DTD\s\+XHTML\s'
     
    515515diff -Naur vim72.orig/src/auto/configure vim72/src/auto/configure
    516516--- vim72.orig/src/auto/configure       2008-07-24 05:40:36.000000000 -0700
    517 +++ vim72/src/auto/configure    2009-01-31 15:34:57.133820925 -0800
     517+++ vim72/src/auto/configure    2009-02-07 22:15:25.364839224 -0800
    518518@@ -16819,21 +16819,29 @@
    519519   LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
     
    556556diff -Naur vim72.orig/src/buffer.c vim72/src/buffer.c
    557557--- vim72.orig/src/buffer.c     2008-08-06 04:00:48.000000000 -0700
    558 +++ vim72/src/buffer.c  2009-01-31 15:36:29.100163152 -0800
     558+++ vim72/src/buffer.c  2009-02-07 22:17:10.446515715 -0800
    559559@@ -437,10 +437,6 @@
    560560        return;
     
    674674diff -Naur vim72.orig/src/configure.in vim72/src/configure.in
    675675--- vim72.orig/src/configure.in 2008-07-24 05:40:26.000000000 -0700
    676 +++ vim72/src/configure.in      2009-01-31 15:34:57.133820925 -0800
     676+++ vim72/src/configure.in      2009-02-07 22:15:25.364839224 -0800
    677677@@ -3152,18 +3152,25 @@
    678678 dnl But only when making dependencies, cproto and lint don't take "-isystem".
     
    709709diff -Naur vim72.orig/src/diff.c vim72/src/diff.c
    710710--- vim72.orig/src/diff.c       2008-03-05 03:16:56.000000000 -0800
    711 +++ vim72/src/diff.c    2009-01-31 15:36:47.273414164 -0800
     711+++ vim72/src/diff.c    2009-02-07 22:17:31.848396425 -0800
    712712@@ -8,7 +8,7 @@
    713713  */
     
    835835diff -Naur vim72.orig/src/edit.c vim72/src/edit.c
    836836--- vim72.orig/src/edit.c       2008-08-06 05:51:17.000000000 -0700
    837 +++ vim72/src/edit.c    2009-01-31 15:36:31.884353681 -0800
     837+++ vim72/src/edit.c    2009-02-07 22:17:53.553792150 -0800
    838838@@ -147,6 +147,7 @@
    839839 static int  ins_compl_bs __ARGS((void));
     
    863863     void
    864864 backspace_until_column(col)
    865 @@ -1942,13 +1946,49 @@
     865@@ -1942,13 +1946,50 @@
    866866     {
    867867        curwin->w_cursor.col--;
     
    882882+ * Return TRUE when something was deleted.
    883883+ */
     884+/*ARGSUSED*/
    884885+   static int
    885886+del_char_after_col(limit_col)
     
    895896+        * composing character. */
    896897+       mb_adjust_cursor();
    897 +       while (curwin->w_cursor.col < limit_col)
     898+       while (curwin->w_cursor.col < (colnr_T)limit_col)
    898899+       {
    899900+           int l = utf_ptr2len(ml_get_cursor());
     
    916917 /*
    917918  * CTRL-X pressed in Insert mode.
    918 @@ -2418,7 +2458,7 @@
     919@@ -2418,7 +2459,7 @@
    919920        {
    920921            had_match = (curwin->w_cursor.col > compl_col);
     
    925926 
    926927            /* When the match isn't there (to avoid matching itself) remove it
    927 @@ -2470,7 +2510,7 @@
     928@@ -2470,7 +2511,7 @@
    928929            *p = NUL;
    929930            had_match = (curwin->w_cursor.col > compl_col);
     
    934935 
    935936            /* When the match isn't there (to avoid matching itself) remove it
    936 @@ -3209,7 +3249,7 @@
     937@@ -3209,7 +3250,7 @@
    937938 {
    938939     ins_compl_del_pum();
     
    943944 
    944945     if (compl_started)
    945 @@ -3264,6 +3304,20 @@
     946@@ -3264,6 +3305,20 @@
    946947 }
    947948 
     
    964965  * matches.
    965966  */
    966 @@ -3621,10 +3675,9 @@
     967@@ -3621,10 +3676,9 @@
    967968            {
    968969                ins_compl_delete();
     
    977978            }
    978979 
    979 @@ -4256,7 +4309,7 @@
     980@@ -4187,7 +4241,7 @@
     981        }
     982 
     983        /* check if compl_curr_match has changed, (e.g. other type of
     984-        * expansion added somenthing) */
     985+        * expansion added something) */
     986        if (type != 0 && compl_curr_match != old_match)
     987            found_new_match = OK;
     988 
     989@@ -4256,7 +4310,7 @@
    980990     static void
    981991 ins_compl_insert()
     
    986996        compl_used_match = FALSE;
    987997     else
    988 @@ -4425,7 +4478,7 @@
     998@@ -4425,7 +4479,7 @@
    989999        if (!compl_get_longest || compl_used_match)
    9901000            ins_compl_insert();
     
    9951005     else
    9961006        compl_used_match = FALSE;
    997 @@ -7123,9 +7176,12 @@
     1007@@ -4688,7 +4742,7 @@
     1008                }
     1009                compl_length = curwin->w_cursor.col - (int)compl_col;
     1010                /* IObuff is used to add a "word from the next line" would we
     1011-                * have enough space?  just being paranoic */
     1012+                * have enough space?  just being paranoid */
     1013 #define        MIN_SPACE 75
     1014                if (compl_length > (IOSIZE - MIN_SPACE))
     1015                {
     1016@@ -7123,9 +7177,12 @@
    9981017  * cc == 0: character was inserted, delete it
    9991018  * cc > 0: character was replaced, put cc (first byte of original char) back
     
    10091028     int                cc;
    10101029 #ifdef FEAT_VREPLACE
    1011 @@ -7153,7 +7209,7 @@
     1030@@ -7153,7 +7210,7 @@
    10121031 #ifdef FEAT_MBYTE
    10131032        if (has_mbyte)
     
    10181037            if (State & VREPLACE_FLAG)
    10191038                orig_len = (int)STRLEN(ml_get_cursor());
    1020 @@ -7203,7 +7259,7 @@
     1039@@ -7203,7 +7260,7 @@
    10211040        changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col);
    10221041     }
     
    10271046 
    10281047 #ifdef FEAT_CINDENT
    1029 @@ -8239,7 +8295,7 @@
     1048@@ -8150,7 +8207,7 @@
     1049 /*
     1050  * If the cursor is on an indent, ^T/^D insert/delete one
     1051  * shiftwidth. Otherwise ^T/^D behave like a "<<" or ">>".
     1052- * Always round the indent to 'shiftwith', this is compatible
     1053+ * Always round the indent to 'shiftwidth', this is compatible
     1054  * with vi.  But vi only supports ^T and ^D after an
     1055  * autoindent, we support it everywhere.
     1056  */
     1057@@ -8239,7 +8296,7 @@
    10301058         * Replace mode */
    10311059        if (curwin->w_cursor.lnum != Insstart.lnum
     
    10361064     else
    10371065        (void)del_char(FALSE);
    1038 @@ -8556,7 +8612,7 @@
     1066@@ -8556,7 +8613,7 @@
    10391067                break;
    10401068            }
     
    10471075diff -Naur vim72.orig/src/eval.c vim72/src/eval.c
    10481076--- vim72.orig/src/eval.c       2008-08-07 12:37:22.000000000 -0700
    1049 +++ vim72/src/eval.c    2009-01-31 15:37:02.506466546 -0800
     1077+++ vim72/src/eval.c    2009-02-07 22:18:04.431097639 -0800
    10501078@@ -32,6 +32,9 @@
    10511079 
     
    11861214     static int
    11871215 tv_islocked(tv)
     1216@@ -3902,7 +3928,7 @@
     1217 
     1218 /*
     1219  * Handle top level expression:
     1220- *     expr1 ? expr0 : expr0
     1221+ *     expr2 ? expr1 : expr1
     1222  *
     1223  * "arg" must point to the first non-white of the expression.
     1224  * "arg" is advanced to the next non-white after the recognized expression.
    11881225@@ -6047,6 +6073,25 @@
    11891226 }
     
    15361573            if (arg[j] != NUL)
    15371574-               emsg_funcname(_(e_invarg2), arg);
    1538 +               emsg_funcname(e_invarg2, arg);
     1575+               emsg_funcname((char *)e_invarg2, arg);
    15391576        }
    15401577     }
     
    19271964diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c
    19281965--- vim72.orig/src/ex_cmds2.c   2008-07-13 09:18:22.000000000 -0700
    1929 +++ vim72/src/ex_cmds2.c        2009-01-31 15:33:32.776003353 -0800
    1930 @@ -3145,8 +3145,8 @@
     1966+++ vim72/src/ex_cmds2.c        2009-02-07 22:18:15.152545887 -0800
     1967@@ -2842,6 +2842,7 @@
     1968     linenr_T               save_sourcing_lnum;
     1969     char_u                 *p;
     1970     char_u                 *fname_exp;
     1971+    char_u                 *firstline = NULL;
     1972     int                            retval = FAIL;
     1973 #ifdef FEAT_EVAL
     1974     scid_T                 save_current_SID;
     1975@@ -2992,23 +2993,6 @@
     1976 
     1977     cookie.level = ex_nesting_level;
     1978 #endif
     1979-#ifdef FEAT_MBYTE
     1980-    cookie.conv.vc_type = CONV_NONE;           /* no conversion */
     1981-
     1982-    /* Try reading the first few bytes to check for a UTF-8 BOM. */
     1983-    {
     1984-       char_u      buf[3];
     1985-
     1986-       if (fread((char *)buf, sizeof(char_u), (size_t)3, cookie.fp)
     1987-                                                                 == (size_t)3
     1988-               && buf[0] == 0xef && buf[1] == 0xbb && buf[2] == 0xbf)
     1989-           /* Found BOM, setup conversion and skip over it. */
     1990-           convert_setup(&cookie.conv, (char_u *)"utf-8", p_enc);
     1991-       else
     1992-           /* No BOM found, rewind. */
     1993-           fseek(cookie.fp, 0L, SEEK_SET);
     1994-    }
     1995-#endif
     1996 
     1997     /*
     1998      * Keep the sourcing name/lnum, for recursive calls.
     1999@@ -3018,6 +3002,27 @@
     2000     save_sourcing_lnum = sourcing_lnum;
     2001     sourcing_lnum = 0;
     2002 
     2003+#ifdef FEAT_MBYTE
     2004+    cookie.conv.vc_type = CONV_NONE;           /* no conversion */
     2005+
     2006+    /* Read the first line so we can check for a UTF-8 BOM. */
     2007+    firstline = getsourceline(0, (void *)&cookie, 0);
     2008+    if (firstline != NULL && STRLEN(firstline) >= 3 && firstline[0] == 0xef
     2009+                             && firstline[1] == 0xbb && firstline[2] == 0xbf)
     2010+    {
     2011+       /* Found BOM; setup conversion, skip over BOM and recode the line. */
     2012+       convert_setup(&cookie.conv, (char_u *)"utf-8", p_enc);
     2013+       p = string_convert(&cookie.conv, firstline + 3, NULL);
     2014+       if (p == NULL)
     2015+           p = vim_strsave(firstline + 3);
     2016+       if (p != NULL)
     2017+       {
     2018+           vim_free(firstline);
     2019+           firstline = p;
     2020+       }
     2021+    }
     2022+#endif
     2023+
     2024 #ifdef STARTUPTIME
     2025     time_push(&tv_rel, &tv_start);
     2026 #endif
     2027@@ -3111,9 +3116,8 @@
     2028     /*
     2029      * Call do_cmdline, which will call getsourceline() to get the lines.
     2030      */
     2031-    do_cmdline(NULL, getsourceline, (void *)&cookie,
     2032+    do_cmdline(firstline, getsourceline, (void *)&cookie,
     2033                                     DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_REPEAT);
     2034-
     2035     retval = OK;
     2036 
     2037 #ifdef FEAT_PROFILE
     2038@@ -3145,8 +3149,8 @@
    19312039        verbose_leave();
    19322040     }
     
    19392047 #endif
    19402048 
     2049@@ -3171,6 +3175,7 @@
     2050 #endif
     2051     fclose(cookie.fp);
     2052     vim_free(cookie.nextline);
     2053+    vim_free(firstline);
     2054 #ifdef FEAT_MBYTE
     2055     convert_setup(&cookie.conv, NULL, NULL);
     2056 #endif
    19412057diff -Naur vim72.orig/src/ex_cmds.c vim72/src/ex_cmds.c
    19422058--- vim72.orig/src/ex_cmds.c    2008-08-04 12:15:00.000000000 -0700
    1943 +++ vim72/src/ex_cmds.c 2009-01-31 15:36:36.964705127 -0800
     2059+++ vim72/src/ex_cmds.c 2009-02-07 22:17:58.717640174 -0800
    19442060@@ -24,7 +24,7 @@
    19452061 static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out));
     
    20882204     vim_free(vir.vir_line);
    20892205 #ifdef FEAT_MBYTE
     2206@@ -2414,8 +2417,8 @@
     2207        cursor_on();            /* msg_start() switches it off */
     2208        out_flush();
     2209        silent_mode = save_silent;
     2210-       info_message = FALSE;
     2211     }
     2212+    info_message = FALSE;
     2213 }
     2214 
     2215 /*
    20902216@@ -5059,6 +5062,7 @@
    20912217 
     
    20982224diff -Naur vim72.orig/src/ex_cmds.h vim72/src/ex_cmds.h
    20992225--- vim72.orig/src/ex_cmds.h    2008-06-21 11:47:57.000000000 -0700
    2100 +++ vim72/src/ex_cmds.h 2009-01-31 15:34:23.095473390 -0800
     2226+++ vim72/src/ex_cmds.h 2009-02-07 22:14:49.094844532 -0800
    21012227@@ -278,7 +278,7 @@
    21022228 EX(CMD_crewind,                "crewind",      ex_cc,
     
    21462272diff -Naur vim72.orig/src/ex_docmd.c vim72/src/ex_docmd.c
    21472273--- vim72.orig/src/ex_docmd.c   2008-07-26 04:51:05.000000000 -0700
    2148 +++ vim72/src/ex_docmd.c        2009-01-31 15:36:57.446117894 -0800
     2274+++ vim72/src/ex_docmd.c        2009-02-07 22:17:42.541134237 -0800
    21492275@@ -364,6 +364,7 @@
    21502276 # define ex_function           ex_ni
     
    23632489diff -Naur vim72.orig/src/ex_getln.c vim72/src/ex_getln.c
    23642490--- vim72.orig/src/ex_getln.c   2008-08-08 02:31:33.000000000 -0700
    2365 +++ vim72/src/ex_getln.c        2009-01-31 15:35:15.935116916 -0800
     2491+++ vim72/src/ex_getln.c        2009-02-07 22:15:46.007933510 -0800
    23662492@@ -31,6 +31,8 @@
    23672493     int                cmdattr;        /* attributes for prompt */
     
    24972623diff -Naur vim72.orig/src/feature.h vim72/src/feature.h
    24982624--- vim72.orig/src/feature.h    2008-08-06 04:00:39.000000000 -0700
    2499 +++ vim72/src/feature.h 2009-01-31 15:34:23.099473670 -0800
     2625+++ vim72/src/feature.h 2009-02-07 22:14:49.098945384 -0800
    25002626@@ -767,9 +767,13 @@
    25012627 
     
    25162642diff -Naur vim72.orig/src/fileio.c vim72/src/fileio.c
    25172643--- vim72.orig/src/fileio.c     2008-08-06 04:01:03.000000000 -0700
    2518 +++ vim72/src/fileio.c  2009-01-31 15:36:23.847800531 -0800
     2644+++ vim72/src/fileio.c  2009-02-07 22:17:04.228567398 -0800
    25192645@@ -932,7 +932,10 @@
    25202646     else
     
    27462872diff -Naur vim72.orig/src/fold.c vim72/src/fold.c
    27472873--- vim72.orig/src/fold.c       2008-08-06 04:01:12.000000000 -0700
    2748 +++ vim72/src/fold.c    2009-01-31 15:36:26.439979606 -0800
     2874+++ vim72/src/fold.c    2009-02-07 22:17:06.755120268 -0800
    27492875@@ -48,7 +48,7 @@
    27502876 static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));
     
    28352961diff -Naur vim72.orig/src/getchar.c vim72/src/getchar.c
    28362962--- vim72.orig/src/getchar.c    2008-07-22 09:57:48.000000000 -0700
    2837 +++ vim72/src/getchar.c 2009-01-31 15:35:23.583644643 -0800
     2963+++ vim72/src/getchar.c 2009-02-07 22:15:56.893443498 -0800
    28382964@@ -4702,7 +4702,7 @@
    28392965                        return FAIL;
     
    28562982diff -Naur vim72.orig/src/globals.h vim72/src/globals.h
    28572983--- vim72.orig/src/globals.h    2008-07-26 04:53:29.000000000 -0700
    2858 +++ vim72/src/globals.h 2009-01-31 15:36:29.100163152 -0800
     2984+++ vim72/src/globals.h 2009-02-07 22:17:10.446515715 -0800
    28592985@@ -1022,6 +1022,7 @@
    28602986 #endif
     
    28903016diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c
    28913017--- vim72.orig/src/gui_at_sb.c  2004-06-07 07:32:25.000000000 -0700
    2892 +++ vim72/src/gui_at_sb.c       2009-01-31 15:35:26.611853332 -0800
     3018+++ vim72/src/gui_at_sb.c       2009-02-07 22:16:00.129565861 -0800
    28933019@@ -1078,6 +1078,12 @@
    28943020     Cardinal   *num_params;    /* unused */
     
    29163042diff -Naur vim72.orig/src/gui.c vim72/src/gui.c
    29173043--- vim72.orig/src/gui.c        2008-07-27 12:32:14.000000000 -0700
    2918 +++ vim72/src/gui.c     2009-01-31 15:35:52.701652745 -0800
     3044+++ vim72/src/gui.c     2009-02-07 22:16:28.052906831 -0800
    29193045@@ -139,7 +139,7 @@
    29203046                /* The read returns when the child closes the pipe (or when
     
    30093135diff -Naur vim72.orig/src/gui_gtk_x11.c vim72/src/gui_gtk_x11.c
    30103136--- vim72.orig/src/gui_gtk_x11.c        2008-07-04 03:46:24.000000000 -0700
    3011 +++ vim72/src/gui_gtk_x11.c     2009-01-31 15:35:26.615854449 -0800
     3137+++ vim72/src/gui_gtk_x11.c     2009-02-07 22:16:00.133666993 -0800
    30123138@@ -4070,14 +4070,14 @@
    30133139 
     
    30333159diff -Naur vim72.orig/src/gui_x11.c vim72/src/gui_x11.c
    30343160--- vim72.orig/src/gui_x11.c    2008-06-08 08:13:45.000000000 -0700
    3035 +++ vim72/src/gui_x11.c 2009-01-31 15:34:33.676201425 -0800
     3161+++ vim72/src/gui_x11.c 2009-02-07 22:15:00.616092472 -0800
    30363162@@ -2450,7 +2450,7 @@
    30373163        *colorPtr = colortable[closest];
     
    30453171diff -Naur vim72.orig/src/gui_xmdlg.c vim72/src/gui_xmdlg.c
    30463172--- vim72.orig/src/gui_xmdlg.c  2008-06-21 09:05:32.000000000 -0700
    3047 +++ vim72/src/gui_xmdlg.c       2009-01-31 15:35:26.615854449 -0800
     3173+++ vim72/src/gui_xmdlg.c       2009-02-07 22:16:00.133666993 -0800
    30483174@@ -369,10 +369,10 @@
    30493175     char       buf[TEMP_BUF_SIZE];
     
    32013327diff -Naur vim72.orig/src/gui_xmebw.c vim72/src/gui_xmebw.c
    32023328--- vim72.orig/src/gui_xmebw.c  2007-09-06 03:57:51.000000000 -0700
    3203 +++ vim72/src/gui_xmebw.c       2009-01-31 15:35:26.615854449 -0800
     3329+++ vim72/src/gui_xmebw.c       2009-02-07 22:16:00.133666993 -0800
    32043330@@ -1256,7 +1256,7 @@
    32053331     }
     
    32283354diff -Naur vim72.orig/src/if_cscope.c vim72/src/if_cscope.c
    32293355--- vim72.orig/src/if_cscope.c  2008-06-24 09:32:34.000000000 -0700
    3230 +++ vim72/src/if_cscope.c       2009-01-31 15:36:59.910285794 -0800
     3356+++ vim72/src/if_cscope.c       2009-02-07 22:17:45.055382037 -0800
    32313357@@ -74,7 +74,7 @@
    32323358     { "add",   cs_add,
     
    32713397diff -Naur vim72.orig/src/if_cscope.h vim72/src/if_cscope.h
    32723398--- vim72.orig/src/if_cscope.h  2007-09-02 07:51:08.000000000 -0700
    3273 +++ vim72/src/if_cscope.h       2009-01-31 15:33:09.878422126 -0800
     3399+++ vim72/src/if_cscope.h       2009-02-07 22:13:26.206645342 -0800
    32743400@@ -42,17 +42,6 @@
    32753401  * f 7name     Find this file
     
    32923418diff -Naur vim72.orig/src/if_perl.xs vim72/src/if_perl.xs
    32933419--- vim72.orig/src/if_perl.xs   2008-07-17 13:55:09.000000000 -0700
    3294 +++ vim72/src/if_perl.xs        2009-01-31 15:35:47.625302138 -0800
     3420+++ vim72/src/if_perl.xs        2009-02-07 22:16:22.052343345 -0800
    32953421@@ -136,6 +136,9 @@
    32963422 #  define Perl_newXS_flags dll_Perl_newXS_flags
     
    33433469diff -Naur vim72.orig/src/if_python.c vim72/src/if_python.c
    33443470--- vim72.orig/src/if_python.c  2008-07-17 14:09:32.000000000 -0700
    3345 +++ vim72/src/if_python.c       2009-01-31 15:36:42.045053779 -0800
     3471+++ vim72/src/if_python.c       2009-02-07 22:17:23.579673139 -0800
    33463472@@ -531,6 +531,12 @@
    33473473        if (PythonMod_Init())
     
    34453571diff -Naur vim72.orig/src/if_xcmdsrv.c vim72/src/if_xcmdsrv.c
    34463572--- vim72.orig/src/if_xcmdsrv.c 2008-07-18 06:05:03.000000000 -0700
    3447 +++ vim72/src/if_xcmdsrv.c      2009-01-31 15:34:41.524742283 -0800
     3573+++ vim72/src/if_xcmdsrv.c      2009-02-07 22:15:09.294969689 -0800
    34483574@@ -736,7 +736,7 @@
    34493575                + serverReply.ga_len;
     
    34753601diff -Naur vim72.orig/src/main.c vim72/src/main.c
    34763602--- vim72.orig/src/main.c       2008-07-24 01:40:56.000000000 -0700
    3477 +++ vim72/src/main.c    2009-01-31 15:35:26.615854449 -0800
     3603+++ vim72/src/main.c    2009-02-07 22:16:00.133666993 -0800
    34783604@@ -645,11 +645,12 @@
    34793605 
     
    35373663diff -Naur vim72.orig/src/mark.c vim72/src/mark.c
    35383664--- vim72.orig/src/mark.c       2008-08-08 15:06:49.000000000 -0700
    3539 +++ vim72/src/mark.c    2009-01-31 15:34:23.103474228 -0800
     3665+++ vim72/src/mark.c    2009-02-07 22:14:49.103047074 -0800
    35403666@@ -1627,15 +1627,17 @@
    35413667 
     
    36063732diff -Naur vim72.orig/src/mbyte.c vim72/src/mbyte.c
    36073733--- vim72.orig/src/mbyte.c      2008-07-14 05:38:05.000000000 -0700
    3608 +++ vim72/src/mbyte.c   2009-01-31 15:35:26.619854170 -0800
     3734+++ vim72/src/mbyte.c   2009-02-07 22:16:00.137768683 -0800
    36093735@@ -717,7 +717,7 @@
    36103736                     * where mblen() returns 0 for invalid character.
     
    36883814diff -Naur vim72.orig/src/menu.c vim72/src/menu.c
    36893815--- vim72.orig/src/menu.c       2008-06-21 12:53:43.000000000 -0700
    3690 +++ vim72/src/menu.c    2009-01-31 15:33:04.726068725 -0800
     3816+++ vim72/src/menu.c    2009-02-07 22:13:20.029714486 -0800
    36913817@@ -1120,6 +1120,7 @@
    36923818        parent = menu;
     
    36993825diff -Naur vim72.orig/src/message.c vim72/src/message.c
    37003826--- vim72.orig/src/message.c    2008-07-09 11:24:55.000000000 -0700
    3701 +++ vim72/src/message.c 2009-01-31 15:36:34.352524934 -0800
     3827+++ vim72/src/message.c 2009-02-07 22:17:15.799035061 -0800
    37023828@@ -4556,7 +4556,13 @@
    37033829                        remove_trailing_zeroes = TRUE;
     
    38013927diff -Naur vim72.orig/src/misc1.c vim72/src/misc1.c
    38023928--- vim72.orig/src/misc1.c      2008-07-12 12:20:53.000000000 -0700
    3803 +++ vim72/src/misc1.c   2009-01-31 15:34:23.107474508 -0800
     3929+++ vim72/src/misc1.c   2009-02-07 22:14:49.107148764 -0800
    38043930@@ -3245,9 +3245,9 @@
    38053931 
     
    38163942diff -Naur vim72.orig/src/misc2.c vim72/src/misc2.c
    38173943--- vim72.orig/src/misc2.c      2008-07-23 12:12:56.000000000 -0700
    3818 +++ vim72/src/misc2.c   2009-01-31 15:36:49.785587652 -0800
     3944+++ vim72/src/misc2.c   2009-02-07 22:17:34.370847325 -0800
    38193945@@ -873,7 +873,7 @@
    38203946            /* 3. check for available memory: call mch_avail_mem() */
     
    38974023diff -Naur vim72.orig/src/move.c vim72/src/move.c
    38984024--- vim72.orig/src/move.c       2008-07-12 09:26:47.000000000 -0700
    3899 +++ vim72/src/move.c    2009-01-31 15:34:52.053468641 -0800
     4025+++ vim72/src/move.c    2009-02-07 22:15:20.110754575 -0800
    39004026@@ -280,18 +280,20 @@
    39014027 
     
    39474073diff -Naur vim72.orig/src/netbeans.c vim72/src/netbeans.c
    39484074--- vim72.orig/src/netbeans.c   2008-07-13 09:19:54.000000000 -0700
    3949 +++ vim72/src/netbeans.c        2009-01-31 15:36:29.100163152 -0800
     4075+++ vim72/src/netbeans.c        2009-02-07 22:17:10.446515715 -0800
    39504076@@ -1043,7 +1043,7 @@
    39514077        nbdebug(("EVT: %s", buf));
     
    40364162diff -Naur vim72.orig/src/normal.c vim72/src/normal.c
    40374163--- vim72.orig/src/normal.c     2008-07-31 13:03:08.000000000 -0700
    4038 +++ vim72/src/normal.c  2009-01-31 15:35:07.274520185 -0800
     4164+++ vim72/src/normal.c  2009-02-07 22:17:56.080346418 -0800
    40394165@@ -183,6 +183,8 @@
    40404166 static void    nv_cursorhold __ARGS((cmdarg_T *cap));
     
    42224348     /*
    42234349      * Execute the command.
     4350@@ -6728,6 +6783,8 @@
     4351     /* Visual mode "r" */
     4352     if (VIsual_active)
     4353     {
     4354+       if (got_int)
     4355+           reset_VIsual();
     4356        nv_operator(cap);
     4357        return;
     4358     }
     4359@@ -7784,7 +7841,7 @@
     4360        else
     4361            i = curwin->w_leftcol;
     4362        /* Go to the middle of the screen line.  When 'number' is on and lines
     4363-        * are wrapping the middle can be more to the left.*/
     4364+        * are wrapping the middle can be more to the left. */
     4365        if (cap->nchar == 'm')
     4366            i += (W_WIDTH(curwin) - curwin_col_off()
     4367                    + ((curwin->w_p_wrap && i > 0)
    42244368diff -Naur vim72.orig/src/ops.c vim72/src/ops.c
    42254369--- vim72.orig/src/ops.c        2008-06-21 13:08:59.000000000 -0700
    4226 +++ vim72/src/ops.c     2009-01-31 15:35:50.225482051 -0800
     4370+++ vim72/src/ops.c     2009-02-07 22:16:25.009559715 -0800
    42274371@@ -2209,12 +2209,15 @@
    42284372     {
     
    42454389diff -Naur vim72.orig/src/option.c vim72/src/option.c
    42464390--- vim72.orig/src/option.c     2008-07-18 06:05:33.000000000 -0700
    4247 +++ vim72/src/option.c  2009-01-31 15:36:13.627096243 -0800
     4391+++ vim72/src/option.c  2009-02-07 22:18:06.941245984 -0800
    42484392@@ -2593,13 +2593,13 @@
    42494393 #ifdef FEAT_VIMINFO
     
    42634407 #endif
    42644408 #else
    4265 @@ -7974,6 +7974,11 @@
     4409@@ -5407,6 +5407,10 @@
     4410     int                did_chartab = FALSE;
     4411     char_u     **gvarp;
     4412     long_u     free_oldval = (options[opt_idx].flags & P_ALLOCED);
     4413+#ifdef FEAT_GUI
     4414+    /* set when changing an option that only requires a redraw in the GUI */
     4415+    int                redraw_gui_only = FALSE;
     4416+#endif
     4417 
     4418     /* Get the global option to compare with, otherwise we would have to check
     4419      * two values for all local options. */
     4420@@ -6055,6 +6059,7 @@
     4421                    errmsg = (char_u *)N_("E596: Invalid font(s)");
     4422            }
     4423        }
     4424+       redraw_gui_only = TRUE;
     4425     }
     4426 # ifdef FEAT_XFONTSET
     4427     else if (varp == &p_guifontset)
     4428@@ -6063,6 +6068,7 @@
     4429            errmsg = (char_u *)N_("E597: can't select fontset");
     4430        else if (gui.in_use && gui_init_font(p_guifontset, TRUE) != OK)
     4431            errmsg = (char_u *)N_("E598: Invalid fontset");
     4432+       redraw_gui_only = TRUE;
     4433     }
     4434 # endif
     4435 # ifdef FEAT_MBYTE
     4436@@ -6072,6 +6078,7 @@
     4437            errmsg = (char_u *)N_("E533: can't select wide font");
     4438        else if (gui_get_wide_font() == FAIL)
     4439            errmsg = (char_u *)N_("E534: Invalid wide font");
     4440+       redraw_gui_only = TRUE;
     4441     }
     4442 # endif
     4443 #endif
     4444@@ -6133,13 +6140,24 @@
     4445 #ifdef FEAT_GUI
     4446     /* 'guioptions' */
     4447     else if (varp == &p_go)
     4448+    {
     4449        gui_init_which_components(oldval);
     4450+       redraw_gui_only = TRUE;
     4451+    }
     4452 #endif
     4453 
     4454 #if defined(FEAT_GUI_TABLINE)
     4455     /* 'guitablabel' */
     4456     else if (varp == &p_gtl)
     4457+    {
     4458        redraw_tabline = TRUE;
     4459+       redraw_gui_only = TRUE;
     4460+    }
     4461+    /* 'guitabtooltip' */
     4462+    else if (varp == &p_gtt)
     4463+    {
     4464+       redraw_gui_only = TRUE;
     4465+    }
     4466 #endif
     4467 
     4468 #if defined(FEAT_MOUSE_TTY) && (defined(UNIX) || defined(VMS))
     4469@@ -6717,7 +6735,11 @@
     4470 
     4471     if (curwin->w_curswant != MAXCOL)
     4472        curwin->w_set_curswant = TRUE;  /* in case 'showbreak' changed */
     4473-    check_redraw(options[opt_idx].flags);
     4474+#ifdef FEAT_GUI
     4475+    /* check redraw when it's not a GUI option or the GUI is active. */
     4476+    if (!redraw_gui_only || gui.in_use)
     4477+#endif
     4478+       check_redraw(options[opt_idx].flags);
     4479 
     4480     return errmsg;
     4481 }
     4482@@ -7974,6 +7996,11 @@
    42664483        else /* curwin->w_p_scr > curwin->w_height */
    42674484            curwin->w_p_scr = curwin->w_height;
     
    42754492     {
    42764493        errmsg = e_positive;
    4277 @@ -8227,13 +8232,13 @@
     4494@@ -8227,13 +8254,13 @@
    42784495            {
    42794496                if (number == 0 && string != NULL)
     
    42924509                        /* There's another character after zeros or the string
    42934510                         * is empty.  In both cases, we are trying to set a
    4294 @@ -8323,7 +8328,7 @@
     4511@@ -8323,7 +8350,7 @@
    42954512     {
    42964513        --arg;                      /* put arg at the '<' */
     
    43034520diff -Naur vim72.orig/src/os_unix.c vim72/src/os_unix.c
    43044521--- vim72.orig/src/os_unix.c    2008-08-06 04:01:40.000000000 -0700
    4305 +++ vim72/src/os_unix.c 2009-01-31 15:35:26.627854728 -0800
     4522+++ vim72/src/os_unix.c 2009-02-07 22:18:01.281110211 -0800
    43064523@@ -315,12 +315,15 @@
    43074524     {-1,           "Unknown!", FALSE}
     
    43534570                    /* Don't need this now that we've duplicated it */
    43544571                    close(fd);
    4355 @@ -3996,13 +4000,13 @@
     4572@@ -3946,7 +3950,17 @@
     4573                 * children can be kill()ed.  Don't do this when using pipes,
     4574                 * because stdin is not a tty, we would lose /dev/tty. */
     4575                if (p_stmp)
     4576+               {
     4577                    (void)setsid();
     4578+#  if defined(SIGHUP)
     4579+                   /* When doing "!xterm&" and 'shell' is bash: the shell
     4580+                    * will exit and send SIGHUP to all processes in its
     4581+                    * group, killing the just started process.  Ignore SIGHUP
     4582+                    * to avoid that. (suggested by Simon Schubert)
     4583+                    */
     4584+                   signal(SIGHUP, SIG_IGN);
     4585+#  endif
     4586+               }
     4587 # endif
     4588 # ifdef FEAT_GUI
     4589                if (pty_slave_fd >= 0)
     4590@@ -3996,13 +4010,13 @@
    43564591 
    43574592                    /* set up stdin/stdout/stderr for the child */
     
    43704605 
    43714606                    close(pty_slave_fd);    /* has been dupped, close it now */
    4372 @@ -4013,13 +4017,13 @@
     4607@@ -4013,13 +4027,13 @@
    43734608                    /* set up stdin for the child */
    43744609                    close(fd_toshell[1]);
     
    43864621 
    43874622 # ifdef FEAT_GUI
    4388 @@ -4027,7 +4031,7 @@
     4623@@ -4027,7 +4041,7 @@
    43894624                    {
    43904625                        /* set up stderr for the child */
     
    43954630 # endif
    43964631                }
    4397 @@ -4158,7 +4162,8 @@
     4632@@ -4158,7 +4172,8 @@
    43984633                                            && (lnum !=
    43994634                                                    curbuf->b_ml.ml_line_count
     
    44054640                                if (lnum > curbuf->b_op_end.lnum)
    44064641                                {
    4407 @@ -6814,7 +6819,8 @@
     4642@@ -6814,7 +6829,8 @@
    44084643     if (xsmp_icefd != -1)
    44094644     {
     
    44174652diff -Naur vim72.orig/src/proto/eval.pro vim72/src/proto/eval.pro
    44184653--- vim72.orig/src/proto/eval.pro       2008-08-09 07:31:25.000000000 -0700
    4419 +++ vim72/src/proto/eval.pro    2009-01-31 15:35:07.274520185 -0800
     4654+++ vim72/src/proto/eval.pro    2009-02-07 22:15:36.283161615 -0800
    44204655@@ -17,7 +17,7 @@
    44214656 int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip));
     
    44594694diff -Naur vim72.orig/src/proto/ex_cmds.pro vim72/src/proto/ex_cmds.pro
    44604695--- vim72.orig/src/proto/ex_cmds.pro    2008-08-09 07:31:25.000000000 -0700
    4461 +++ vim72/src/proto/ex_cmds.pro 2009-01-31 15:34:23.107474508 -0800
     4696+++ vim72/src/proto/ex_cmds.pro 2009-02-07 22:14:49.107148764 -0800
    44624697@@ -11,7 +11,7 @@
    44634698 char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
     
    44714706diff -Naur vim72.orig/src/proto/ex_getln.pro vim72/src/proto/ex_getln.pro
    44724707--- vim72.orig/src/proto/ex_getln.pro   2008-08-09 07:31:28.000000000 -0700
    4473 +++ vim72/src/proto/ex_getln.pro        2009-01-31 15:35:15.935116916 -0800
     4708+++ vim72/src/proto/ex_getln.pro        2009-02-07 22:15:46.007933510 -0800
    44744709@@ -31,7 +31,7 @@
    44754710 void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col));
     
    44834718diff -Naur vim72.orig/src/proto/mark.pro vim72/src/proto/mark.pro
    44844719--- vim72.orig/src/proto/mark.pro       2008-08-09 07:31:36.000000000 -0700
    4485 +++ vim72/src/proto/mark.pro    2009-01-31 15:34:23.107474508 -0800
     4720+++ vim72/src/proto/mark.pro    2009-02-07 22:14:49.107148764 -0800
    44864721@@ -26,5 +26,5 @@
    44874722 void write_viminfo_filemarks __ARGS((FILE *fp));
     
    44934728diff -Naur vim72.orig/src/proto/misc2.pro vim72/src/proto/misc2.pro
    44944729--- vim72.orig/src/proto/misc2.pro      2008-08-09 07:31:40.000000000 -0700
    4495 +++ vim72/src/proto/misc2.pro   2009-01-31 15:36:13.627096243 -0800
     4730+++ vim72/src/proto/misc2.pro   2009-02-07 22:16:52.932903479 -0800
    44964731@@ -59,7 +59,7 @@
    44974732 int handle_x_keys __ARGS((int key));
     
    45054740diff -Naur vim72.orig/src/proto/netbeans.pro vim72/src/proto/netbeans.pro
    45064741--- vim72.orig/src/proto/netbeans.pro   2008-08-09 07:31:56.000000000 -0700
    4507 +++ vim72/src/proto/netbeans.pro        2009-01-31 15:36:29.100163152 -0800
     4742+++ vim72/src/proto/netbeans.pro        2009-02-07 22:17:10.446515715 -0800
    45084743@@ -11,7 +11,7 @@
    45094744 void netbeans_frame_moved __ARGS((int new_x, int new_y));
     
    45174752diff -Naur vim72.orig/src/pty.c vim72/src/pty.c
    45184753--- vim72.orig/src/pty.c        2008-06-21 11:52:58.000000000 -0700
    4519 +++ vim72/src/pty.c     2009-01-31 15:33:01.673856405 -0800
     4754+++ vim72/src/pty.c     2009-02-07 22:13:17.113511664 -0800
    45204755@@ -270,9 +270,10 @@
    45214756 }
     
    45334768diff -Naur vim72.orig/src/screen.c vim72/src/screen.c
    45344769--- vim72.orig/src/screen.c     2008-07-24 07:45:07.000000000 -0700
    4535 +++ vim72/src/screen.c  2009-01-31 15:34:02.242033525 -0800
     4770+++ vim72/src/screen.c  2009-02-07 22:14:27.770892024 -0800
    45364771@@ -2439,9 +2439,17 @@
    45374772 
     
    45574792diff -Naur vim72.orig/src/spell.c vim72/src/spell.c
    45584793--- vim72.orig/src/spell.c      2008-07-12 12:20:55.000000000 -0700
    4559 +++ vim72/src/spell.c   2009-01-31 15:36:03.026364856 -0800
     4794+++ vim72/src/spell.c   2009-02-07 22:16:39.143494343 -0800
    45604795@@ -77,7 +77,7 @@
    45614796 
     
    53925627diff -Naur vim72.orig/src/structs.h vim72/src/structs.h
    53935628--- vim72.orig/src/structs.h    2008-07-30 13:02:50.000000000 -0700
    5394 +++ vim72/src/structs.h 2009-01-31 15:34:52.057470876 -0800
     5629+++ vim72/src/structs.h 2009-02-07 22:15:20.110754575 -0800
    53955630@@ -459,7 +459,7 @@
    53965631 typedef struct
     
    54215656diff -Naur vim72.orig/src/tag.c vim72/src/tag.c
    54225657--- vim72.orig/src/tag.c        2008-07-16 14:31:30.000000000 -0700
    5423 +++ vim72/src/tag.c     2009-01-31 15:36:39.424873027 -0800
     5658+++ vim72/src/tag.c     2009-02-07 22:17:21.020306747 -0800
    54245659@@ -515,7 +515,7 @@
    54255660             * If a count is supplied to the ":tag <name>" command, then
     
    54765711diff -Naur vim72.orig/src/term.c vim72/src/term.c
    54775712--- vim72.orig/src/term.c       2008-07-27 04:48:06.000000000 -0700
    5478 +++ vim72/src/term.c    2009-01-31 15:36:44.645233133 -0800
     5713+++ vim72/src/term.c    2009-02-07 22:17:26.245680123 -0800
    54795714@@ -4920,7 +4920,15 @@
    54805715        key_name[0] = KEY2TERMCAP0(key);
     
    54965731diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile
    54975732--- vim72.orig/src/testdir/Makefile     2008-06-19 13:29:46.000000000 -0700
    5498 +++ vim72/src/testdir/Makefile  2009-01-31 15:33:40.756551753 -0800
     5733+++ vim72/src/testdir/Makefile  2009-02-07 22:14:04.798116497 -0800
    54995734@@ -26,15 +26,17 @@
    55005735 
     
    55305765diff -Naur vim72.orig/src/testdir/Make_ming.mak vim72/src/testdir/Make_ming.mak
    55315766--- vim72.orig/src/testdir/Make_ming.mak        1969-12-31 16:00:00.000000000 -0800
    5532 +++ vim72/src/testdir/Make_ming.mak     2009-01-31 15:33:59.649856405 -0800
     5767+++ vim72/src/testdir/Make_ming.mak     2009-02-07 22:14:24.920315687 -0800
    55335768@@ -0,0 +1,91 @@
    55345769+# Makefile to run tests for Vim, on Dos-like machines
     
    56255860diff -Naur vim72.orig/src/testdir/test42.ok vim72/src/testdir/test42.ok
    56265861--- vim72.orig/src/testdir/test42.ok    2008-02-20 04:27:37.000000000 -0800
    5627 +++ vim72/src/testdir/test42.ok 2009-01-31 15:34:28.175823718 -0800
     5862+++ vim72/src/testdir/test42.ok 2009-02-07 22:14:55.472752061 -0800
    56285863@@ -20,7 +20,7 @@
    56295864 ucs-2
     
    56375872diff -Naur vim72.orig/src/ui.c vim72/src/ui.c
    56385873--- vim72.orig/src/ui.c 2008-07-14 11:14:56.000000000 -0700
    5639 +++ vim72/src/ui.c      2009-01-31 15:35:26.631855287 -0800
     5874+++ vim72/src/ui.c      2009-02-07 22:16:00.150072915 -0800
    56405875@@ -1820,7 +1820,7 @@
    56415876 #ifdef HAVE_DUP
     
    57455980diff -Naur vim72.orig/src/version.c vim72/src/version.c
    57465981--- vim72.orig/src/version.c    2008-08-09 07:24:52.000000000 -0700
    5747 +++ vim72/src/version.c 2009-01-31 15:37:02.510466825 -0800
    5748 @@ -677,9 +677,188 @@
     5982+++ vim72/src/version.c 2009-02-07 22:18:15.152545887 -0800
     5983@@ -677,9 +677,204 @@
    57495984 static int included_patches[] =
    57505985 {   /* Add new patch number below this line */
    57515986 /**/
     5987+    102,
     5988+/**/
     5989+    100,
     5990+/**/
     5991+    99,
     5992+/**/
     5993+    98,
     5994+/**/
     5995+    97,
     5996+/**/
     5997+    96,
     5998+/**/
     5999+    95,
     6000+/**/
     6001+    94,
     6002+/**/
    57526003+    92,
    57536004+/**/
     
    59356186 highest_patch()
    59366187 {
    5937 @@ -786,7 +965,7 @@
     6188@@ -786,7 +981,7 @@
    59386189     MSG_PUTS(_("\nRISC OS version"));
    59396190 #endif
     
    59446195     if (*compiled_arch != NUL)
    59456196     {
    5946 @@ -825,6 +1004,19 @@
     6197@@ -825,6 +1020,19 @@
    59476198        }
    59486199     }
     
    59666217diff -Naur vim72.orig/src/vim.h vim72/src/vim.h
    59676218--- vim72.orig/src/vim.h        2008-08-09 09:03:38.000000000 -0700
    5968 +++ vim72/src/vim.h     2009-01-31 15:35:04.666340271 -0800
     6219+++ vim72/src/vim.h     2009-02-07 22:15:33.719691856 -0800
    59696220@@ -341,8 +341,14 @@
    59706221 #ifdef BACKSLASH_IN_FILENAME
     
    60266277diff -Naur vim72.orig/src/window.c vim72/src/window.c
    60276278--- vim72.orig/src/window.c     2008-08-06 04:00:30.000000000 -0700
    6028 +++ vim72/src/window.c  2009-01-31 15:35:26.631855287 -0800
     6279+++ vim72/src/window.c  2009-02-07 22:16:00.150072915 -0800
    60296280@@ -4028,14 +4028,14 @@
    60306281            if (mch_dirname(cwd, MAXPATHL) == OK)
     
    60476298diff -Naur vim72.orig/src/workshop.c vim72/src/workshop.c
    60486299--- vim72.orig/src/workshop.c   2008-06-21 11:53:26.000000000 -0700
    6049 +++ vim72/src/workshop.c        2009-01-31 15:35:20.991464171 -0800
     6300+++ vim72/src/workshop.c        2009-02-07 22:15:51.274319877 -0800
    60506301@@ -1121,8 +1121,12 @@
    60516302                                      ? (char *)curbuf->b_sfname : "<None>");
Note: See TracChangeset for help on using the changeset viewer.