Changeset 5f4a45c9


Ignore:
Timestamp:
Feb 3, 2009, 9:27:46 AM (14 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:
51fa34f
Parents:
ef1a894
Message:

Updated Vim Branch Update Patch to -6

Files:
2 edited
1 moved

Legend:

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

    ref1a894 r5f4a45c9  
    4848        <listitem>
    4949          <para>[Jim] - Updated to Linux 2.6.28.3.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[Jim] - Updated Vim Branch Update Patch to -6.</para>
    5053        </listitem>
    5154      </itemizedlist>
  • BOOK/patches.ent

    ref1a894 r5f4a45c9  
    127127<!ENTITY tar-revert_pipe_drain-patch-size "4 KB">
    128128
    129 <!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-5.patch">
    130 <!ENTITY vim-branch_update-patch-md5 "ad13a427a46ae23abe8740ab66fba15d">
    131 <!ENTITY vim-branch_update-patch-size "180 KB">
     129<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-6.patch">
     130<!ENTITY vim-branch_update-patch-md5 "2cb86afc95be5becb82028614a961d2e">
     131<!ENTITY vim-branch_update-patch-size "184 KB">
    132132
    133133<!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">
  • patches/vim-7.2-branch_update-6.patch

    ref1a894 r5f4a45c9  
    11Submitted By: Jim Gifford (jim at cross-lfs dot org)
    2 Date: 01-19-2009
     2Date: 01-31-2009
    33Initial Package Version: 7.2
    44Origin: Upstream
    55Upstream Status: Applied
    6 Description: Contains all upstream patches up to 7.2.084
     6Description: Contains all upstream patches up to 7.2.093
    77             The following patches were skipped
    8              007 036 041 049 071 072 074
     8             007 036 041 049 071 072 074 088 089 093
    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-19 00:08:05.000000000 -0800
     12+++ vim72/Filelist      2009-01-31 15:33:59.649856405 -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-19 00:08:30.000000000 -0800
     23+++ vim72/runtime/doc/cmdline.txt       2009-01-31 15:34:23.083470597 -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-19 00:10:10.000000000 -0800
     82+++ vim72/runtime/doc/eval.txt  2009-01-31 15:35:55.361836011 -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-19 00:10:45.000000000 -0800
     202+++ vim72/runtime/doc/netbeans.txt      2009-01-31 15:36:29.096162872 -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-19 00:09:28.000000000 -0800
     224+++ vim72/runtime/doc/options.txt       2009-01-31 15:35:15.943118033 -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-19 00:09:54.000000000 -0800
     244+++ vim72/runtime/doc/spell.txt 2009-01-31 15:35:40.064779160 -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-19 00:08:31.000000000 -0800
     374+++ vim72/runtime/doc/starting.txt      2009-01-31 15:34:23.087472832 -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-19 00:08:31.000000000 -0800
     436+++ vim72/runtime/doc/usr_21.txt        2009-01-31 15:34:23.087472832 -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-19 00:07:18.000000000 -0800
     503+++ vim72/runtime/scripts.vim   2009-01-31 15:33:15.442805979 -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-19 00:09:07.000000000 -0800
     517+++ vim72/src/auto/configure    2009-01-31 15:34:57.133820925 -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-19 00:10:45.000000000 -0800
     558+++ vim72/src/buffer.c  2009-01-31 15:36:29.100163152 -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-19 00:09:07.000000000 -0800
     676+++ vim72/src/configure.in      2009-01-31 15:34:57.133820925 -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-19 00:09:50.000000000 -0800
     711+++ vim72/src/diff.c    2009-01-31 15:36:47.273414164 -0800
     712@@ -8,7 +8,7 @@
     713  */
     714 
     715 /*
     716- * diff.c: code for diff'ing two or three buffers.
     717+ * diff.c: code for diff'ing two, three or four buffers.
     718  */
     719 
     720 #include "vim.h"
    712721@@ -73,6 +73,8 @@
    713722        {
     
    727736        }
    728737     }
     738@@ -113,7 +116,7 @@
     739  * Add a buffer to make diffs for.
     740  * Call this when a new buffer is being edited in the current window where
     741  * 'diff' is set.
     742- * Marks the current buffer as being part of the diff and requireing updating.
     743+ * Marks the current buffer as being part of the diff and requiring updating.
     744  * This must be done before any autocmd, because a command may use info
     745  * about the screen contents.
     746  */
    729747@@ -131,6 +134,7 @@
    730748        {
     
    784802        diff_a_works = MAYBE;
    785803 #if defined(MSWIN) || defined(MSDOS)
     804@@ -914,7 +929,7 @@
     805        goto theend;
     806 
     807 #ifdef UNIX
     808-    /* Temporaraly chdir to /tmp, to avoid patching files in the current
     809+    /* Temporarily chdir to /tmp, to avoid patching files in the current
     810      * directory when the patch file contains more than one patch.  When we
     811      * have our own temp dir use that instead, it will be cleaned up when we
     812      * exit (any .rej files created).  Don't change directory if we can't
    786813@@ -925,10 +940,10 @@
    787814     {
     
    797824     }
    798825 #endif
     826@@ -2114,6 +2129,8 @@
     827            EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg);
     828            return;
     829        }
     830+       if (buf == curbuf)
     831+           return;             /* nothing to do */
     832        idx_other = diff_buf_idx(buf);
     833        if (idx_other == DB_COUNT)
     834        {
    799835diff -Naur vim72.orig/src/edit.c vim72/src/edit.c
    800836--- vim72.orig/src/edit.c       2008-08-06 05:51:17.000000000 -0700
    801 +++ vim72/src/edit.c    2009-01-19 00:10:48.000000000 -0800
     837+++ vim72/src/edit.c    2009-01-31 15:36:31.884353681 -0800
    802838@@ -147,6 +147,7 @@
    803839 static int  ins_compl_bs __ARGS((void));
     
    10111047diff -Naur vim72.orig/src/eval.c vim72/src/eval.c
    10121048--- vim72.orig/src/eval.c       2008-08-07 12:37:22.000000000 -0700
    1013 +++ vim72/src/eval.c    2009-01-19 00:10:21.000000000 -0800
     1049+++ vim72/src/eval.c    2009-01-31 15:37:02.506466546 -0800
    10141050@@ -32,6 +32,9 @@
    10151051 
     
    12541290     {"has_key",                2, 2, f_has_key},
    12551291     {"haslocaldir",    0, 0, f_haslocaldir},
    1256 @@ -9518,7 +9580,7 @@
     1292@@ -7856,9 +7918,9 @@
     1293     else if (!aborting())
     1294     {
     1295        if (argcount == MAX_FUNC_ARGS)
     1296-           emsg_funcname("E740: Too many arguments for function %s", name);
     1297+           emsg_funcname(N_("E740: Too many arguments for function %s"), name);
     1298        else
     1299-           emsg_funcname("E116: Invalid arguments for function %s", name);
     1300+           emsg_funcname(N_("E116: Invalid arguments for function %s"), name);
     1301     }
     1302 
     1303     while (--argcount >= 0)
     1304@@ -8091,6 +8153,7 @@
     1305 
     1306 /*
     1307  * Give an error message with a function name.  Handle <SNR> things.
     1308+ * "ermsg" is to be passed without translation, use N_() instead of _().
     1309  */
     1310     static void
     1311 emsg_funcname(ermsg, name)
     1312@@ -9518,7 +9581,7 @@
    12571313     else
    12581314     {
     
    12631319                                    && get_tv_number_chk(&argvars[1], &error))
    12641320            flags |= WILD_KEEP_ALL;
    1265 @@ -10300,7 +10362,8 @@
     1321@@ -10300,7 +10363,8 @@
    12661322     s = get_tv_string(&argvars[0]);
    12671323     if (s == NULL || *s == NUL || VIM_ISDIGIT(*s))
     
    12731329     else
    12741330     {
    1275 @@ -10602,7 +10665,7 @@
     1331@@ -10602,7 +10666,7 @@
    12761332 # ifdef FEAT_WINDOWS
    12771333            win_T       *wp;
     
    12821338            if (row >= 0 && col >= 0)
    12831339            {
    1284 @@ -10612,9 +10675,9 @@
     1340@@ -10612,9 +10676,9 @@
    12851341                (void)mouse_comp_pos(win, &row, &col, &lnum);
    12861342 # ifdef FEAT_WINDOWS
     
    12941350                vimvars[VV_MOUSE_COL].vv_nr = col + 1;
    12951351            }
    1296 @@ -11284,13 +11347,25 @@
     1352@@ -11284,13 +11348,25 @@
    12971353     typval_T   *argvars;
    12981354     typval_T   *rettv;
     
    13241380 
    13251381 /*
    1326 @@ -11301,14 +11376,22 @@
     1382@@ -11301,14 +11377,22 @@
    13271383     typval_T   *argvars;
    13281384     typval_T   *rettv;
     
    13491405 
    13501406 /*
    1351 @@ -11782,6 +11865,10 @@
     1407@@ -11782,6 +11866,10 @@
    13521408            n = has_patch(atoi((char *)name + 5));
    13531409        else if (STRICMP(name, "vim_starting") == 0)
     
    13601416        else if (STRICMP(name, "balloon_multiline") == 0)
    13611417            n = multiline_balloon_available();
    1362 @@ -15838,10 +15925,9 @@
     1418@@ -15838,10 +15926,9 @@
    13631419     if (res == FAIL)
    13641420        res = ITEM_COMPARE_FAIL;
     
    13721428     return res;
    13731429 }
    1374 @@ -16590,8 +16676,11 @@
     1430@@ -16590,8 +16677,11 @@
    13751431                p = highlight_has_attr(id, HL_INVERSE, modec);
    13761432                break;
     
    13861442 
    13871443        case 'u':
    1388 @@ -16658,7 +16747,7 @@
     1444@@ -16658,7 +16748,7 @@
    13891445     col = get_tv_number(&argvars[1]) - 1;      /* -1 on type error */
    13901446 
     
    13951451     {
    13961452        (void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL, TRUE);
    1397 @@ -18097,14 +18186,28 @@
     1453@@ -18097,14 +18187,28 @@
    13981454 }
    13991455 
     
    14271483     vimvars[VV_COUNT1].vv_nr = count1;
    14281484 }
    1429 @@ -18132,6 +18235,20 @@
     1485@@ -18132,6 +18236,20 @@
    14301486 }
    14311487 
     
    14481504  */
    14491505     void
    1450 @@ -18868,7 +18985,7 @@
     1506@@ -18868,7 +18986,7 @@
    14511507     dictitem_T *dict_var;
    14521508 {
     
    14571513     dict_var->di_tv.v_type = VAR_DICT;
    14581514     dict_var->di_tv.v_lock = VAR_FIXED;
    1459 @@ -19205,6 +19322,8 @@
     1515@@ -19205,6 +19323,8 @@
    14601516  * Copy the values from typval_T "from" to typval_T "to".
    14611517  * When needed allocates string or increases reference count.
     
    14661522     static void
    14671523 copy_tv(from, to)
    1468 @@ -20590,6 +20709,9 @@
     1524@@ -19748,7 +19868,7 @@
     1525                }
     1526            }
     1527            else
     1528-               emsg_funcname("E123: Undefined function: %s", name);
     1529+               emsg_funcname(N_("E123: Undefined function: %s"), name);
     1530        }
     1531        goto ret_free;
     1532     }
     1533@@ -19792,7 +19912,7 @@
     1534                                                      : eval_isnamec(arg[j])))
     1535                ++j;
     1536            if (arg[j] != NUL)
     1537-               emsg_funcname(_(e_invarg2), arg);
     1538+               emsg_funcname(e_invarg2, arg);
     1539        }
     1540     }
     1541 
     1542@@ -20064,7 +20184,7 @@
     1543        v = find_var(name, &ht);
     1544        if (v != NULL && v->di_tv.v_type == VAR_FUNC)
     1545        {
     1546-           emsg_funcname("E707: Function name conflicts with variable: %s",
     1547+           emsg_funcname(N_("E707: Function name conflicts with variable: %s"),
     1548                                                                        name);
     1549            goto erret;
     1550        }
     1551@@ -20079,7 +20199,7 @@
     1552            }
     1553            if (fp->uf_calls > 0)
     1554            {
     1555-               emsg_funcname("E127: Cannot redefine function %s: It is in use",
     1556+               emsg_funcname(N_("E127: Cannot redefine function %s: It is in use"),
     1557                                                                        name);
     1558                goto erret;
     1559            }
     1560@@ -20590,6 +20710,9 @@
    14691561     int                st_len = 0;
    14701562 
     
    14761568 
    14771569     for (hi = func_hashtab.ht_array; todo > 0; ++hi)
    1478 @@ -20638,6 +20760,8 @@
     1570@@ -20638,6 +20761,8 @@
    14791571                                                              prof_self_cmp);
    14801572        prof_sort_list(fd, sorttab, st_len, "SELF", TRUE);
     
    14851577 
    14861578     static void
    1487 @@ -21012,7 +21136,7 @@
     1579@@ -21012,7 +21137,7 @@
    14881580     char_u     *save_sourcing_name;
    14891581     linenr_T   save_sourcing_lnum;
     
    14941586     static int depth = 0;
    14951587     dictitem_T *v;
    1496 @@ -21038,36 +21162,37 @@
     1588@@ -21038,36 +21163,37 @@
    14971589 
    14981590     line_breakcheck();         /* check for CTRL-C hit */
     
    15451637        v->di_tv.v_lock = 0;
    15461638        v->di_tv.vval.v_dict = selfdict;
    1547 @@ -21079,28 +21204,31 @@
     1639@@ -21079,28 +21205,31 @@
    15481640      * Set a:0 to "argcount".
    15491641      * Set a:000 to a list with room for the "..." arguments.
     
    15881680     for (i = 0; i < argcount; ++i)
    15891681     {
    1590 @@ -21116,7 +21244,7 @@
     1682@@ -21116,7 +21245,7 @@
    15911683        }
    15921684        if (fixvar_idx < FIXVAR_CNT && STRLEN(name) <= VAR_SHORT_LEN)
     
    15971689        }
    15981690        else
    1599 @@ -21128,7 +21256,7 @@
     1691@@ -21128,7 +21257,7 @@
    16001692            v->di_flags = DI_FLAGS_RO;
    16011693        }
     
    16061698        /* Note: the values are copied directly to avoid alloc/free.
    16071699         * "argvars" must have VAR_FIXED for v_lock. */
    1608 @@ -21137,9 +21265,9 @@
     1700@@ -21137,9 +21266,9 @@
    16091701 
    16101702        if (ai >= 0 && ai < MAX_FUNC_ARGS)
     
    16191711     }
    16201712 
    1621 @@ -21204,7 +21332,7 @@
     1713@@ -21204,7 +21333,7 @@
    16221714        if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
    16231715            func_do_profile(fp);
     
    16281720            ++fp->uf_tm_count;
    16291721            profile_start(&call_start);
    1630 @@ -21220,7 +21348,7 @@
     1722@@ -21220,7 +21349,7 @@
    16311723     did_emsg = FALSE;
    16321724 
     
    16371729 
    16381730     --RedrawingDisabled;
    1639 @@ -21235,16 +21363,16 @@
     1731@@ -21235,16 +21364,16 @@
    16401732 
    16411733 #ifdef FEAT_PROFILE
     
    16581750     }
    16591751 #endif
    1660 @@ -21257,9 +21385,9 @@
     1752@@ -21257,9 +21386,9 @@
    16611753 
    16621754        if (aborting())
     
    16701762        {
    16711763            char_u      buf[MSG_BUF_LEN];
    1672 @@ -21270,7 +21398,7 @@
     1764@@ -21270,7 +21399,7 @@
    16731765            /* The value may be very long.  Skip the middle part, so that we
    16741766             * have some idea how it starts and ends. smsg() would always
     
    16791771            {
    16801772                trunc_string(s, buf, MSG_BUF_CLEN);
    1681 @@ -21306,14 +21434,84 @@
     1773@@ -21306,14 +21435,84 @@
    16821774     }
    16831775 
     
    17321824+/*
    17331825+ * Return TRUE if items in "fc" do not have "copyID".  That means they are not
    1734 + * referenced from anywyere.
     1826+ * referenced from anywhere.
    17351827+ */
    17361828+    static int
     
    17701862 
    17711863 /*
    1772 @@ -21886,6 +22084,62 @@
     1864@@ -21886,6 +22085,62 @@
    17731865     }
    17741866 }
     
    18331925 
    18341926 
     1927diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c
     1928--- 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 @@
     1931        verbose_leave();
     1932     }
     1933 #ifdef STARTUPTIME
     1934-    vim_snprintf(IObuff, IOSIZE, "sourcing %s", fname);
     1935-    time_msg(IObuff, &tv_start);
     1936+    vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname);
     1937+    time_msg((char *)IObuff, &tv_start);
     1938     time_pop(&tv_rel);
     1939 #endif
     1940 
    18351941diff -Naur vim72.orig/src/ex_cmds.c vim72/src/ex_cmds.c
    18361942--- vim72.orig/src/ex_cmds.c    2008-08-04 12:15:00.000000000 -0700
    1837 +++ vim72/src/ex_cmds.c 2009-01-19 00:10:54.000000000 -0800
     1943+++ vim72/src/ex_cmds.c 2009-01-31 15:36:36.964705127 -0800
    18381944@@ -24,7 +24,7 @@
    18391945 static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out));
     
    19922098diff -Naur vim72.orig/src/ex_cmds.h vim72/src/ex_cmds.h
    19932099--- vim72.orig/src/ex_cmds.h    2008-06-21 11:47:57.000000000 -0700
    1994 +++ vim72/src/ex_cmds.h 2009-01-19 00:08:31.000000000 -0800
     2100+++ vim72/src/ex_cmds.h 2009-01-31 15:34:23.095473390 -0800
    19952101@@ -278,7 +278,7 @@
    19962102 EX(CMD_crewind,                "crewind",      ex_cc,
     
    20382144                        TRLBAR|EXTRA|CMDWIN|SBOXOK),
    20392145 EX(CMD_setfiletype,    "setfiletype",  ex_setfiletype,
    2040 diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c
    2041 --- vim72.orig/src/ex_cmds2.c   2008-07-13 09:18:22.000000000 -0700
    2042 +++ vim72/src/ex_cmds2.c        2009-01-19 00:07:35.000000000 -0800
    2043 @@ -3145,8 +3145,8 @@
    2044         verbose_leave();
    2045      }
    2046  #ifdef STARTUPTIME
    2047 -    vim_snprintf(IObuff, IOSIZE, "sourcing %s", fname);
    2048 -    time_msg(IObuff, &tv_start);
    2049 +    vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname);
    2050 +    time_msg((char *)IObuff, &tv_start);
    2051      time_pop(&tv_rel);
    2052  #endif
    2053  
    20542146diff -Naur vim72.orig/src/ex_docmd.c vim72/src/ex_docmd.c
    20552147--- vim72.orig/src/ex_docmd.c   2008-07-26 04:51:05.000000000 -0700
    2056 +++ vim72/src/ex_docmd.c        2009-01-19 00:10:13.000000000 -0800
     2148+++ vim72/src/ex_docmd.c        2009-01-31 15:36:57.446117894 -0800
    20572149@@ -364,6 +364,7 @@
    20582150 # define ex_function           ex_ni
     
    20882180 #endif
    20892181        case CMD_set:
    2090 @@ -8749,8 +8752,8 @@
     2182@@ -5479,6 +5482,9 @@
     2183     return OK;
     2184 }
     2185 
     2186+/*
     2187+ * ":command ..."
     2188+ */
     2189     static void
     2190 ex_command(eap)
     2191     exarg_T   *eap;
     2192@@ -5911,6 +5917,7 @@
     2193 
     2194     char_u     *start;
     2195     char_u     *end;
     2196+    char_u     *ksp;
     2197     size_t     len, totlen;
     2198 
     2199     size_t     split_len = 0;
     2200@@ -5927,16 +5934,51 @@
     2201 
     2202     /*
     2203      * Replace <> in the command by the arguments.
     2204+     * First round: "buf" is NULL, compute length, allocate "buf".
     2205+     * Second round: copy result into "buf".
     2206      */
     2207     buf = NULL;
     2208     for (;;)
     2209     {
     2210-       p = cmd->uc_rep;
     2211-       q = buf;
     2212+       p = cmd->uc_rep;    /* source */
     2213+       q = buf;            /* destinateion */
     2214        totlen = 0;
     2215-       while ((start = vim_strchr(p, '<')) != NULL
     2216-              && (end = vim_strchr(start + 1, '>')) != NULL)
     2217+
     2218+       for (;;)
     2219        {
     2220+           start = vim_strchr(p, '<');
     2221+           if (start != NULL)
     2222+               end = vim_strchr(start + 1, '>');
     2223+           if (buf != NULL)
     2224+           {
     2225+               ksp = vim_strchr(p, K_SPECIAL);
     2226+               if (ksp != NULL && (start == NULL || ksp < start || end == NULL)
     2227+                       && ((ksp[1] == KS_SPECIAL && ksp[2] == KE_FILLER)
     2228+# ifdef FEAT_GUI
     2229+                           || (ksp[1] == KS_EXTRA && ksp[2] == (int)KE_CSI)
     2230+# endif
     2231+                           ))
     2232+               {
     2233+                   /* K_SPECIAL han been put in the buffer as K_SPECIAL
     2234+                    * KS_SPECIAL KE_FILLER, like for mappings, but
     2235+                    * do_cmdline() doesn't handle that, so convert it back.
     2236+                    * Also change K_SPECIAL KS_EXTRA KE_CSI into CSI. */
     2237+                   len = ksp - p;
     2238+                   if (len > 0)
     2239+                   {
     2240+                       mch_memmove(q, p, len);
     2241+                       q += len;
     2242+                   }
     2243+                   *q++ = ksp[1] == KS_SPECIAL ? K_SPECIAL : CSI;
     2244+                   p = ksp + 3;
     2245+                   continue;
     2246+               }
     2247+           }
     2248+
     2249+           /* break if there no <item> is found */
     2250+           if (start == NULL || end == NULL)
     2251+               break;
     2252+
     2253            /* Include the '>' */
     2254            ++end;
     2255 
     2256@@ -8749,8 +8791,8 @@
    20912257                else if (*dirnow != NUL
    20922258                        && (ssop_flags & SSOP_CURDIR) && globaldir != NULL)
     
    20992265 
    21002266                failed |= (makeopens(fd, dirnow) == FAIL);
    2101 @@ -9506,24 +9509,50 @@
     2267@@ -9506,24 +9548,50 @@
    21022268                    break;
    21032269                }
     
    21602326 
    21612327 #ifdef FEAT_SEARCHPATH
    2162 @@ -9541,6 +9570,15 @@
     2328@@ -9541,6 +9609,15 @@
    21632329 #ifdef FEAT_AUTOCMD
    21642330        case SPEC_AFILE:        /* file name for autocommand */
     
    21762342                {
    21772343                    *errormsg = (char_u *)_("E495: no autocommand file name to substitute for \"<afile>\"");
    2178 @@ -10067,7 +10105,7 @@
     2344@@ -10067,7 +10144,7 @@
    21792345      */
    21802346     if (put_line(fd, "let s:sx = expand(\"<sfile>:p:r\").\"x.vim\"") == FAIL
     
    21852351        return FAIL;
    21862352 
    2187 @@ -10689,7 +10727,8 @@
     2353@@ -10689,7 +10766,8 @@
    21882354        p_viminfo = (char_u *)"'100";
    21892355     if (eap->cmdidx == CMD_rviminfo)
     
    21972363diff -Naur vim72.orig/src/ex_getln.c vim72/src/ex_getln.c
    21982364--- vim72.orig/src/ex_getln.c   2008-08-08 02:31:33.000000000 -0700
    2199 +++ vim72/src/ex_getln.c        2009-01-19 00:09:28.000000000 -0800
     2365+++ vim72/src/ex_getln.c        2009-01-31 15:35:15.935116916 -0800
    22002366@@ -31,6 +31,8 @@
    22012367     int                cmdattr;        /* attributes for prompt */
     
    23312497diff -Naur vim72.orig/src/feature.h vim72/src/feature.h
    23322498--- vim72.orig/src/feature.h    2008-08-06 04:00:39.000000000 -0700
    2333 +++ vim72/src/feature.h 2009-01-19 00:08:31.000000000 -0800
     2499+++ vim72/src/feature.h 2009-01-31 15:34:23.099473670 -0800
    23342500@@ -767,9 +767,13 @@
    23352501 
     
    23502516diff -Naur vim72.orig/src/fileio.c vim72/src/fileio.c
    23512517--- vim72.orig/src/fileio.c     2008-08-06 04:01:03.000000000 -0700
    2352 +++ vim72/src/fileio.c  2009-01-19 00:10:40.000000000 -0800
     2518+++ vim72/src/fileio.c  2009-01-31 15:36:23.847800531 -0800
    23532519@@ -932,7 +932,10 @@
    23542520     else
     
    25802746diff -Naur vim72.orig/src/fold.c vim72/src/fold.c
    25812747--- vim72.orig/src/fold.c       2008-08-06 04:01:12.000000000 -0700
    2582 +++ vim72/src/fold.c    2009-01-19 00:10:42.000000000 -0800
     2748+++ vim72/src/fold.c    2009-01-31 15:36:26.439979606 -0800
    25832749@@ -48,7 +48,7 @@
    25842750 static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));
     
    26692835diff -Naur vim72.orig/src/getchar.c vim72/src/getchar.c
    26702836--- vim72.orig/src/getchar.c    2008-07-22 09:57:48.000000000 -0700
    2671 +++ vim72/src/getchar.c 2009-01-19 00:09:36.000000000 -0800
     2837+++ vim72/src/getchar.c 2009-01-31 15:35:23.583644643 -0800
    26722838@@ -4702,7 +4702,7 @@
    26732839                        return FAIL;
     
    26902856diff -Naur vim72.orig/src/globals.h vim72/src/globals.h
    26912857--- vim72.orig/src/globals.h    2008-07-26 04:53:29.000000000 -0700
    2692 +++ vim72/src/globals.h 2009-01-19 00:10:45.000000000 -0800
     2858+++ vim72/src/globals.h 2009-01-31 15:36:29.100163152 -0800
    26932859@@ -1022,6 +1022,7 @@
    26942860 #endif
     
    27222888  */
    27232889 #ifdef FEAT_FKMAP
     2890diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c
     2891--- 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
     2893@@ -1078,6 +1078,12 @@
     2894     Cardinal   *num_params;    /* unused */
     2895 {
     2896     ScrollbarWidget sbw = (ScrollbarWidget)w;
     2897+    /* Use a union to avoid a warning for the weird conversion from float to
     2898+     * XtPointer.  Comes from Xaw/Scrollbar.c. */
     2899+    union {
     2900+       XtPointer xtp;
     2901+       float xtf;
     2902+    } xtpf;
     2903 
     2904     if (LookAhead(w, event))
     2905        return;
     2906@@ -1085,7 +1091,8 @@
     2907     /* thumbProc is not pretty, but is necessary for backwards
     2908        compatibility on those architectures for which it work{s,ed};
     2909        the intent is to pass a (truncated) float by value. */
     2910-    XtCallCallbacks(w, XtNthumbProc, *(XtPointer*)&sbw->scrollbar.top);
     2911+    xtpf.xtf = sbw->scrollbar.top;
     2912+    XtCallCallbacks(w, XtNthumbProc, xtpf.xtp);
     2913     XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
     2914 }
     2915 
    27242916diff -Naur vim72.orig/src/gui.c vim72/src/gui.c
    27252917--- vim72.orig/src/gui.c        2008-07-27 12:32:14.000000000 -0700
    2726 +++ vim72/src/gui.c     2009-01-19 00:10:07.000000000 -0800
     2918+++ vim72/src/gui.c     2009-01-31 15:35:52.701652745 -0800
    27272919@@ -139,7 +139,7 @@
    27282920                /* The read returns when the child closes the pipe (or when
     
    28153007        }
    28163008 #ifdef FEAT_WINDOWS
    2817 diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c
    2818 --- vim72.orig/src/gui_at_sb.c  2004-06-07 07:32:25.000000000 -0700
    2819 +++ vim72/src/gui_at_sb.c       2009-01-19 00:09:39.000000000 -0800
    2820 @@ -1078,6 +1078,12 @@
    2821      Cardinal   *num_params;    /* unused */
    2822  {
    2823      ScrollbarWidget sbw = (ScrollbarWidget)w;
    2824 +    /* Use a union to avoid a warning for the weird conversion from float to
    2825 +     * XtPointer.  Comes from Xaw/Scrollbar.c. */
    2826 +    union {
    2827 +       XtPointer xtp;
    2828 +       float xtf;
    2829 +    } xtpf;
    2830  
    2831      if (LookAhead(w, event))
    2832         return;
    2833 @@ -1085,7 +1091,8 @@
    2834      /* thumbProc is not pretty, but is necessary for backwards
    2835         compatibility on those architectures for which it work{s,ed};
    2836         the intent is to pass a (truncated) float by value. */
    2837 -    XtCallCallbacks(w, XtNthumbProc, *(XtPointer*)&sbw->scrollbar.top);
    2838 +    xtpf.xtf = sbw->scrollbar.top;
    2839 +    XtCallCallbacks(w, XtNthumbProc, xtpf.xtp);
    2840      XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
    2841  }
    2842  
    28433009diff -Naur vim72.orig/src/gui_gtk_x11.c vim72/src/gui_gtk_x11.c
    28443010--- vim72.orig/src/gui_gtk_x11.c        2008-07-04 03:46:24.000000000 -0700
    2845 +++ vim72/src/gui_gtk_x11.c     2009-01-19 00:09:39.000000000 -0800
     3011+++ vim72/src/gui_gtk_x11.c     2009-01-31 15:35:26.615854449 -0800
    28463012@@ -4070,14 +4070,14 @@
    28473013 
     
    28673033diff -Naur vim72.orig/src/gui_x11.c vim72/src/gui_x11.c
    28683034--- vim72.orig/src/gui_x11.c    2008-06-08 08:13:45.000000000 -0700
    2869 +++ vim72/src/gui_x11.c 2009-01-19 00:08:42.000000000 -0800
     3035+++ vim72/src/gui_x11.c 2009-01-31 15:34:33.676201425 -0800
    28703036@@ -2450,7 +2450,7 @@
    28713037        *colorPtr = colortable[closest];
     
    28793045diff -Naur vim72.orig/src/gui_xmdlg.c vim72/src/gui_xmdlg.c
    28803046--- vim72.orig/src/gui_xmdlg.c  2008-06-21 09:05:32.000000000 -0700
    2881 +++ vim72/src/gui_xmdlg.c       2009-01-19 00:09:39.000000000 -0800
     3047+++ vim72/src/gui_xmdlg.c       2009-01-31 15:35:26.615854449 -0800
    28823048@@ -369,10 +369,10 @@
    28833049     char       buf[TEMP_BUF_SIZE];
     
    30353201diff -Naur vim72.orig/src/gui_xmebw.c vim72/src/gui_xmebw.c
    30363202--- vim72.orig/src/gui_xmebw.c  2007-09-06 03:57:51.000000000 -0700
    3037 +++ vim72/src/gui_xmebw.c       2009-01-19 00:09:39.000000000 -0800
     3203+++ vim72/src/gui_xmebw.c       2009-01-31 15:35:26.615854449 -0800
    30383204@@ -1256,7 +1256,7 @@
    30393205     }
     
    30623228diff -Naur vim72.orig/src/if_cscope.c vim72/src/if_cscope.c
    30633229--- vim72.orig/src/if_cscope.c  2008-06-24 09:32:34.000000000 -0700
    3064 +++ vim72/src/if_cscope.c       2009-01-19 00:07:11.000000000 -0800
     3230+++ vim72/src/if_cscope.c       2009-01-31 15:36:59.910285794 -0800
    30653231@@ -74,7 +74,7 @@
    30663232     { "add",   cs_add,
     
    30723238                N_("Show this message"),      "help", 0 },
    30733239     { "kill",  cs_kill,
    3074 @@ -1180,7 +1180,16 @@
    3075         (void)smsg((char_u *)_("%-5s: %-30s (Usage: %s)"),
    3076                                       cmdp->name, _(cmdp->help), cmdp->usage);
     3240@@ -1177,10 +1177,27 @@
     3241     (void)MSG_PUTS(_("cscope commands:\n"));
     3242     while (cmdp->name != NULL)
     3243     {
     3244-       (void)smsg((char_u *)_("%-5s: %-30s (Usage: %s)"),
     3245-                                     cmdp->name, _(cmdp->help), cmdp->usage);
     3246+       char *help = _(cmdp->help);
     3247+       int  space_cnt = 30 - vim_strsize((char_u *)help);
     3248+
     3249+       /* Use %*s rather than %30s to ensure proper alignment in utf-8 */
     3250+       if (space_cnt < 0)
     3251+           space_cnt = 0;
     3252+       (void)smsg((char_u *)_("%-5s: %s%*s (Usage: %s)"),
     3253+                                     cmdp->name,
     3254+                                     help, space_cnt, " ",
     3255+                                     cmdp->usage);
    30773256        if (strcmp(cmdp->name, "find") == 0)
    30783257-           MSG_PUTS(FIND_HELP);
     
    30923271diff -Naur vim72.orig/src/if_cscope.h vim72/src/if_cscope.h
    30933272--- vim72.orig/src/if_cscope.h  2007-09-02 07:51:08.000000000 -0700
    3094 +++ vim72/src/if_cscope.h       2009-01-19 00:07:11.000000000 -0800
     3273+++ vim72/src/if_cscope.h       2009-01-31 15:33:09.878422126 -0800
    30953274@@ -42,17 +42,6 @@
    30963275  * f 7name     Find this file
     
    31133292diff -Naur vim72.orig/src/if_perl.xs vim72/src/if_perl.xs
    31143293--- vim72.orig/src/if_perl.xs   2008-07-17 13:55:09.000000000 -0700
    3115 +++ vim72/src/if_perl.xs        2009-01-19 00:10:02.000000000 -0800
     3294+++ vim72/src/if_perl.xs        2009-01-31 15:35:47.625302138 -0800
    31163295@@ -136,6 +136,9 @@
    31173296 #  define Perl_newXS_flags dll_Perl_newXS_flags
     
    31643343diff -Naur vim72.orig/src/if_python.c vim72/src/if_python.c
    31653344--- vim72.orig/src/if_python.c  2008-07-17 14:09:32.000000000 -0700
    3166 +++ vim72/src/if_python.c       2009-01-19 00:10:59.000000000 -0800
     3345+++ vim72/src/if_python.c       2009-01-31 15:36:42.045053779 -0800
    31673346@@ -531,6 +531,12 @@
    31683347        if (PythonMod_Init())
     
    32663445diff -Naur vim72.orig/src/if_xcmdsrv.c vim72/src/if_xcmdsrv.c
    32673446--- vim72.orig/src/if_xcmdsrv.c 2008-07-18 06:05:03.000000000 -0700
    3268 +++ vim72/src/if_xcmdsrv.c      2009-01-19 00:08:50.000000000 -0800
     3447+++ vim72/src/if_xcmdsrv.c      2009-01-31 15:34:41.524742283 -0800
    32693448@@ -736,7 +736,7 @@
    32703449                + serverReply.ga_len;
     
    32963475diff -Naur vim72.orig/src/main.c vim72/src/main.c
    32973476--- vim72.orig/src/main.c       2008-07-24 01:40:56.000000000 -0700
    3298 +++ vim72/src/main.c    2009-01-19 00:09:39.000000000 -0800
     3477+++ vim72/src/main.c    2009-01-31 15:35:26.615854449 -0800
    32993478@@ -645,11 +645,12 @@
    33003479 
     
    33583537diff -Naur vim72.orig/src/mark.c vim72/src/mark.c
    33593538--- vim72.orig/src/mark.c       2008-08-08 15:06:49.000000000 -0700
    3360 +++ vim72/src/mark.c    2009-01-19 00:08:31.000000000 -0800
     3539+++ vim72/src/mark.c    2009-01-31 15:34:23.103474228 -0800
    33613540@@ -1627,15 +1627,17 @@
    33623541 
     
    34273606diff -Naur vim72.orig/src/mbyte.c vim72/src/mbyte.c
    34283607--- vim72.orig/src/mbyte.c      2008-07-14 05:38:05.000000000 -0700
    3429 +++ vim72/src/mbyte.c   2009-01-19 00:09:39.000000000 -0800
     3608+++ vim72/src/mbyte.c   2009-01-31 15:35:26.619854170 -0800
    34303609@@ -717,7 +717,7 @@
    34313610                     * where mblen() returns 0 for invalid character.
     
    35093688diff -Naur vim72.orig/src/menu.c vim72/src/menu.c
    35103689--- vim72.orig/src/menu.c       2008-06-21 12:53:43.000000000 -0700
    3511 +++ vim72/src/menu.c    2009-01-19 00:07:05.000000000 -0800
     3690+++ vim72/src/menu.c    2009-01-31 15:33:04.726068725 -0800
    35123691@@ -1120,6 +1120,7 @@
    35133692        parent = menu;
     
    35203699diff -Naur vim72.orig/src/message.c vim72/src/message.c
    35213700--- vim72.orig/src/message.c    2008-07-09 11:24:55.000000000 -0700
    3522 +++ vim72/src/message.c 2009-01-19 00:10:51.000000000 -0800
     3701+++ vim72/src/message.c 2009-01-31 15:36:34.352524934 -0800
    35233702@@ -4556,7 +4556,13 @@
    35243703                        remove_trailing_zeroes = TRUE;
     
    36223801diff -Naur vim72.orig/src/misc1.c vim72/src/misc1.c
    36233802--- vim72.orig/src/misc1.c      2008-07-12 12:20:53.000000000 -0700
    3624 +++ vim72/src/misc1.c   2009-01-19 00:08:31.000000000 -0800
     3803+++ vim72/src/misc1.c   2009-01-31 15:34:23.107474508 -0800
    36253804@@ -3245,9 +3245,9 @@
    36263805 
     
    36373816diff -Naur vim72.orig/src/misc2.c vim72/src/misc2.c
    36383817--- vim72.orig/src/misc2.c      2008-07-23 12:12:56.000000000 -0700
    3639 +++ vim72/src/misc2.c   2009-01-19 00:10:29.000000000 -0800
     3818+++ vim72/src/misc2.c   2009-01-31 15:36:49.785587652 -0800
    36403819@@ -873,7 +873,7 @@
    36413820            /* 3. check for available memory: call mch_avail_mem() */
     
    37063885 
    37073886            /*
     3887@@ -4698,7 +4696,8 @@
     3888                                stackp->ffs_filearray_cur = i + 1;
     3889                                ff_push(search_ctx, stackp);
     3890 
     3891-                               simplify_filename(file_path);
     3892+                               if (!path_with_url(file_path))
     3893+                                   simplify_filename(file_path);
     3894                                if (mch_dirname(ff_expand_buffer, MAXPATHL)
     3895                                                                        == OK)
     3896                                {
    37083897diff -Naur vim72.orig/src/move.c vim72/src/move.c
    37093898--- vim72.orig/src/move.c       2008-07-12 09:26:47.000000000 -0700
    3710 +++ vim72/src/move.c    2009-01-19 00:09:02.000000000 -0800
     3899+++ vim72/src/move.c    2009-01-31 15:34:52.053468641 -0800
    37113900@@ -280,18 +280,20 @@
    37123901 
     
    37583947diff -Naur vim72.orig/src/netbeans.c vim72/src/netbeans.c
    37593948--- vim72.orig/src/netbeans.c   2008-07-13 09:19:54.000000000 -0700
    3760 +++ vim72/src/netbeans.c        2009-01-19 00:10:45.000000000 -0800
     3949+++ vim72/src/netbeans.c        2009-01-31 15:36:29.100163152 -0800
    37613950@@ -1043,7 +1043,7 @@
    37623951        nbdebug(("EVT: %s", buf));
     
    38474036diff -Naur vim72.orig/src/normal.c vim72/src/normal.c
    38484037--- vim72.orig/src/normal.c     2008-07-31 13:03:08.000000000 -0700
    3849 +++ vim72/src/normal.c  2009-01-19 00:09:18.000000000 -0800
     4038+++ vim72/src/normal.c  2009-01-31 15:35:07.274520185 -0800
    38504039@@ -183,6 +183,8 @@
    38514040 static void    nv_cursorhold __ARGS((cmdarg_T *cap));
     
    40354224diff -Naur vim72.orig/src/ops.c vim72/src/ops.c
    40364225--- vim72.orig/src/ops.c        2008-06-21 13:08:59.000000000 -0700
    4037 +++ vim72/src/ops.c     2009-01-19 00:10:04.000000000 -0800
     4226+++ vim72/src/ops.c     2009-01-31 15:35:50.225482051 -0800
    40384227@@ -2209,12 +2209,15 @@
    40394228     {
     
    40564245diff -Naur vim72.orig/src/option.c vim72/src/option.c
    40574246--- vim72.orig/src/option.c     2008-07-18 06:05:33.000000000 -0700
    4058 +++ vim72/src/option.c  2009-01-19 00:10:29.000000000 -0800
     4247+++ vim72/src/option.c  2009-01-31 15:36:13.627096243 -0800
    40594248@@ -2593,13 +2593,13 @@
    40604249 #ifdef FEAT_VIMINFO
     
    41144303diff -Naur vim72.orig/src/os_unix.c vim72/src/os_unix.c
    41154304--- vim72.orig/src/os_unix.c    2008-08-06 04:01:40.000000000 -0700
    4116 +++ vim72/src/os_unix.c 2009-01-19 00:09:40.000000000 -0800
     4305+++ vim72/src/os_unix.c 2009-01-31 15:35:26.627854728 -0800
    41174306@@ -315,12 +315,15 @@
    41184307     {-1,           "Unknown!", FALSE}
     
    42284417diff -Naur vim72.orig/src/proto/eval.pro vim72/src/proto/eval.pro
    42294418--- vim72.orig/src/proto/eval.pro       2008-08-09 07:31:25.000000000 -0700
    4230 +++ vim72/src/proto/eval.pro    2009-01-19 00:09:18.000000000 -0800
     4419+++ vim72/src/proto/eval.pro    2009-01-31 15:35:07.274520185 -0800
    42314420@@ -17,7 +17,7 @@
    42324421 int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip));
     
    42704459diff -Naur vim72.orig/src/proto/ex_cmds.pro vim72/src/proto/ex_cmds.pro
    42714460--- vim72.orig/src/proto/ex_cmds.pro    2008-08-09 07:31:25.000000000 -0700
    4272 +++ vim72/src/proto/ex_cmds.pro 2009-01-19 00:08:31.000000000 -0800
     4461+++ vim72/src/proto/ex_cmds.pro 2009-01-31 15:34:23.107474508 -0800
    42734462@@ -11,7 +11,7 @@
    42744463 char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
     
    42824471diff -Naur vim72.orig/src/proto/ex_getln.pro vim72/src/proto/ex_getln.pro
    42834472--- vim72.orig/src/proto/ex_getln.pro   2008-08-09 07:31:28.000000000 -0700
    4284 +++ vim72/src/proto/ex_getln.pro        2009-01-19 00:09:28.000000000 -0800
     4473+++ vim72/src/proto/ex_getln.pro        2009-01-31 15:35:15.935116916 -0800
    42854474@@ -31,7 +31,7 @@
    42864475 void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col));
     
    42944483diff -Naur vim72.orig/src/proto/mark.pro vim72/src/proto/mark.pro
    42954484--- vim72.orig/src/proto/mark.pro       2008-08-09 07:31:36.000000000 -0700
    4296 +++ vim72/src/proto/mark.pro    2009-01-19 00:08:31.000000000 -0800
     4485+++ vim72/src/proto/mark.pro    2009-01-31 15:34:23.107474508 -0800
    42974486@@ -26,5 +26,5 @@
    42984487 void write_viminfo_filemarks __ARGS((FILE *fp));
     
    43044493diff -Naur vim72.orig/src/proto/misc2.pro vim72/src/proto/misc2.pro
    43054494--- vim72.orig/src/proto/misc2.pro      2008-08-09 07:31:40.000000000 -0700
    4306 +++ vim72/src/proto/misc2.pro   2009-01-19 00:10:29.000000000 -0800
     4495+++ vim72/src/proto/misc2.pro   2009-01-31 15:36:13.627096243 -0800
    43074496@@ -59,7 +59,7 @@
    43084497 int handle_x_keys __ARGS((int key));
     
    43164505diff -Naur vim72.orig/src/proto/netbeans.pro vim72/src/proto/netbeans.pro
    43174506--- vim72.orig/src/proto/netbeans.pro   2008-08-09 07:31:56.000000000 -0700
    4318 +++ vim72/src/proto/netbeans.pro        2009-01-19 00:10:45.000000000 -0800
     4507+++ vim72/src/proto/netbeans.pro        2009-01-31 15:36:29.100163152 -0800
    43194508@@ -11,7 +11,7 @@
    43204509 void netbeans_frame_moved __ARGS((int new_x, int new_y));
     
    43284517diff -Naur vim72.orig/src/pty.c vim72/src/pty.c
    43294518--- vim72.orig/src/pty.c        2008-06-21 11:52:58.000000000 -0700
    4330 +++ vim72/src/pty.c     2009-01-19 00:07:02.000000000 -0800
     4519+++ vim72/src/pty.c     2009-01-31 15:33:01.673856405 -0800
    43314520@@ -270,9 +270,10 @@
    43324521 }
     
    43444533diff -Naur vim72.orig/src/screen.c vim72/src/screen.c
    43454534--- vim72.orig/src/screen.c     2008-07-24 07:45:07.000000000 -0700
    4346 +++ vim72/src/screen.c  2009-01-19 00:08:07.000000000 -0800
     4535+++ vim72/src/screen.c  2009-01-31 15:34:02.242033525 -0800
    43474536@@ -2439,9 +2439,17 @@
    43484537 
     
    43684557diff -Naur vim72.orig/src/spell.c vim72/src/spell.c
    43694558--- vim72.orig/src/spell.c      2008-07-12 12:20:55.000000000 -0700
    4370 +++ vim72/src/spell.c   2009-01-19 00:10:18.000000000 -0800
     4559+++ vim72/src/spell.c   2009-01-31 15:36:03.026364856 -0800
    43714560@@ -77,7 +77,7 @@
    43724561 
     
    52035392diff -Naur vim72.orig/src/structs.h vim72/src/structs.h
    52045393--- vim72.orig/src/structs.h    2008-07-30 13:02:50.000000000 -0700
    5205 +++ vim72/src/structs.h 2009-01-19 00:09:02.000000000 -0800
     5394+++ vim72/src/structs.h 2009-01-31 15:34:52.057470876 -0800
    52065395@@ -459,7 +459,7 @@
    52075396 typedef struct
     
    52325421diff -Naur vim72.orig/src/tag.c vim72/src/tag.c
    52335422--- vim72.orig/src/tag.c        2008-07-16 14:31:30.000000000 -0700
    5234 +++ vim72/src/tag.c     2009-01-19 00:10:57.000000000 -0800
     5423+++ vim72/src/tag.c     2009-01-31 15:36:39.424873027 -0800
    52355424@@ -515,7 +515,7 @@
    52365425             * If a count is supplied to the ":tag <name>" command, then
     
    52855474            while (p >= lbuf && vim_iswordc(*p))
    52865475                --p;
     5476diff -Naur vim72.orig/src/term.c vim72/src/term.c
     5477--- 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
     5479@@ -4920,7 +4920,15 @@
     5480        key_name[0] = KEY2TERMCAP0(key);
     5481        key_name[1] = KEY2TERMCAP1(key);
     5482        if (key_name[0] == KS_KEY)
     5483-           string[new_slen++] = key_name[1];   /* from ":set <M-b>=xx" */
     5484+       {
     5485+           /* from ":set <M-b>=xx" */
     5486+#ifdef FEAT_MBYTE
     5487+           if (has_mbyte)
     5488+               new_slen += (*mb_char2bytes)(key_name[1], string + new_slen);
     5489+           else
     5490+#endif
     5491+               string[new_slen++] = key_name[1];
     5492+       }
     5493        else
     5494        {
     5495            string[new_slen++] = K_SPECIAL;
     5496diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile
     5497--- 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
     5499@@ -26,15 +26,17 @@
     5500 
     5501 .SUFFIXES: .in .out
     5502 
     5503-nongui:        nolog $(SCRIPTS)
     5504-       @echo
     5505-       @cat test.log
     5506-       @echo ALL DONE
     5507+nongui:        nolog $(SCRIPTS) report
     5508+
     5509+gui:   nolog $(SCRIPTS) $(SCRIPTS_GUI) report
     5510 
     5511-gui:   nolog $(SCRIPTS) $(SCRIPTS_GUI)
     5512+report:
     5513        @echo
     5514-       @cat test.log
     5515-       @echo ALL DONE
     5516+       @echo 'Test results:'
     5517+       @/bin/sh -c "if test -f test.log; \
     5518+               then cat test.log; echo TEST FAILURE; exit 1; \
     5519+               else echo ALL DONE; \
     5520+               fi"
     5521 
     5522 $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
     5523 
     5524@@ -71,4 +73,4 @@
     5525 test60.out: test60.vim
     5526 
     5527 nolog:
     5528-       -echo Test results: >test.log
     5529+       -rm -f test.log
    52875530diff -Naur vim72.orig/src/testdir/Make_ming.mak vim72/src/testdir/Make_ming.mak
    52885531--- vim72.orig/src/testdir/Make_ming.mak        1969-12-31 16:00:00.000000000 -0800
    5289 +++ vim72/src/testdir/Make_ming.mak     2009-01-19 00:08:05.000000000 -0800
     5532+++ vim72/src/testdir/Make_ming.mak     2009-01-31 15:33:59.649856405 -0800
    52905533@@ -0,0 +1,91 @@
    52915534+# Makefile to run tests for Vim, on Dos-like machines
     
    53805623+       -$(DEL) test.ok
    53815624+       -$(DEL) viminfo
    5382 diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile
    5383 --- vim72.orig/src/testdir/Makefile     2008-06-19 13:29:46.000000000 -0700
    5384 +++ vim72/src/testdir/Makefile  2009-01-19 00:07:44.000000000 -0800
    5385 @@ -26,15 +26,17 @@
    5386  
    5387  .SUFFIXES: .in .out
    5388  
    5389 -nongui:        nolog $(SCRIPTS)
    5390 -       @echo
    5391 -       @cat test.log
    5392 -       @echo ALL DONE
    5393 +nongui:        nolog $(SCRIPTS) report
    5394 +
    5395 +gui:   nolog $(SCRIPTS) $(SCRIPTS_GUI) report
    5396  
    5397 -gui:   nolog $(SCRIPTS) $(SCRIPTS_GUI)
    5398 +report:
    5399         @echo
    5400 -       @cat test.log
    5401 -       @echo ALL DONE
    5402 +       @echo 'Test results:'
    5403 +       @/bin/sh -c "if test -f test.log; \
    5404 +               then cat test.log; echo TEST FAILURE; exit 1; \
    5405 +               else echo ALL DONE; \
    5406 +               fi"
    5407  
    5408  $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
    5409  
    5410 @@ -71,4 +73,4 @@
    5411  test60.out: test60.vim
    5412  
    5413  nolog:
    5414 -       -echo Test results: >test.log
    5415 +       -rm -f test.log
    54165625diff -Naur vim72.orig/src/testdir/test42.ok vim72/src/testdir/test42.ok
    54175626--- vim72.orig/src/testdir/test42.ok    2008-02-20 04:27:37.000000000 -0800
    5418 +++ vim72/src/testdir/test42.ok 2009-01-19 00:08:36.000000000 -0800
     5627+++ vim72/src/testdir/test42.ok 2009-01-31 15:34:28.175823718 -0800
    54195628@@ -20,7 +20,7 @@
    54205629 ucs-2
     
    54285637diff -Naur vim72.orig/src/ui.c vim72/src/ui.c
    54295638--- vim72.orig/src/ui.c 2008-07-14 11:14:56.000000000 -0700
    5430 +++ vim72/src/ui.c      2009-01-19 00:09:40.000000000 -0800
     5639+++ vim72/src/ui.c      2009-01-31 15:35:26.631855287 -0800
    54315640@@ -1820,7 +1820,7 @@
    54325641 #ifdef HAVE_DUP
     
    55365745diff -Naur vim72.orig/src/version.c vim72/src/version.c
    55375746--- vim72.orig/src/version.c    2008-08-09 07:24:52.000000000 -0700
    5538 +++ vim72/src/version.c 2009-01-19 00:10:59.000000000 -0800
    5539 @@ -677,9 +677,176 @@
     5747+++ vim72/src/version.c 2009-01-31 15:37:02.510466825 -0800
     5748@@ -677,9 +677,188 @@
    55405749 static int included_patches[] =
    55415750 {   /* Add new patch number below this line */
    55425751 /**/
     5752+    92,
     5753+/**/
     5754+    91,
     5755+/**/
     5756+    90,
     5757+/**/
     5758+    87,
     5759+/**/
     5760+    86,
     5761+/**/
     5762+    85,
     5763+/**/
    55435764+    84,
    55445765+/**/
     
    57145935 highest_patch()
    57155936 {
    5716 @@ -786,7 +953,7 @@
     5937@@ -786,7 +965,7 @@
    57175938     MSG_PUTS(_("\nRISC OS version"));
    57185939 #endif
     
    57235944     if (*compiled_arch != NUL)
    57245945     {
    5725 @@ -825,6 +992,19 @@
     5946@@ -825,6 +1004,19 @@
    57265947        }
    57275948     }
     
    57455966diff -Naur vim72.orig/src/vim.h vim72/src/vim.h
    57465967--- vim72.orig/src/vim.h        2008-08-09 09:03:38.000000000 -0700
    5747 +++ vim72/src/vim.h     2009-01-19 00:09:15.000000000 -0800
     5968+++ vim72/src/vim.h     2009-01-31 15:35:04.666340271 -0800
    57485969@@ -341,8 +341,14 @@
    57495970 #ifdef BACKSLASH_IN_FILENAME
     
    58056026diff -Naur vim72.orig/src/window.c vim72/src/window.c
    58066027--- vim72.orig/src/window.c     2008-08-06 04:00:30.000000000 -0700
    5807 +++ vim72/src/window.c  2009-01-19 00:09:40.000000000 -0800
     6028+++ vim72/src/window.c  2009-01-31 15:35:26.631855287 -0800
    58086029@@ -4028,14 +4028,14 @@
    58096030            if (mch_dirname(cwd, MAXPATHL) == OK)
     
    58266047diff -Naur vim72.orig/src/workshop.c vim72/src/workshop.c
    58276048--- vim72.orig/src/workshop.c   2008-06-21 11:53:26.000000000 -0700
    5828 +++ vim72/src/workshop.c        2009-01-19 00:09:33.000000000 -0800
     6049+++ vim72/src/workshop.c        2009-01-31 15:35:20.991464171 -0800
    58296050@@ -1121,8 +1121,12 @@
    58306051                                      ? (char *)curbuf->b_sfname : "<None>");
Note: See TracChangeset for help on using the changeset viewer.