Changeset 2830f42


Ignore:
Timestamp:
Oct 29, 2007, 5:29:52 PM (17 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:
0f7e9ab
Parents:
50f4cec
Message:

Updated Vim Patch to Branch Update

Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/vim.xml

    r50f4cec r2830f42  
    3838    archives into the same directory.</para>
    3939
    40     <para os="p1">The following patch contains updates from the maintainer. The
    41     maintainer of Vim only releases these patches to fix serious issues.</para>
    42 
    43 <screen os="p2"><userinput>patch -Np1 -i ../&vim-fixes-patch;</userinput></screen>
     40    <para os="p1">The following patches merges all updates from the &vim-version; Branch
     41    from the Vim developers:</para>
     42
     43<screen os="p2"><userinput>patch -Np1 -i ../&vim-branch_update-patch;</userinput></screen>
    4444
    4545    <para os="b">Change the default location of
  • BOOK/introduction/common/changelog.xml

    r50f4cec r2830f42  
    4242        <listitem>
    4343          <para>[jim] - Updated Binutils 2.18 Branch Update Patch.</para>
     44        </listitem>
     45        <listitem>
     46          <para>[jim] - Updated Vim 7.1 Branch Update Patch.</para>
    4447        </listitem>
    4548      </itemizedlist>
  • BOOK/materials/common/patches.xml

    r50f4cec r2830f42  
    209209
    210210    <varlistentry>
    211       <term>Vim Fixes Patch - <token>&vim-fixes-patch-size;</token>:</term>
    212       <listitem>
    213         <para>Download: <ulink
    214         url="&patches-root;&vim-fixes-patch;"/></para>
    215         <para>MD5 sum: <literal>&vim-fixes-patch-md5;</literal></para>
     211      <term>Vim Branch Update Patch - <token>&vim-branch_update-patch-size;</token>:</term>
     212      <listitem>
     213        <para>Download: <ulink
     214        url="&patches-root;&vim-branch_update-patch;"/></para>
     215        <para>MD5 sum: <literal>&vim-branch_update-patch-md5;</literal></para>
    216216      </listitem>
    217217    </varlistentry>
  • BOOK/patches.ent

    r50f4cec r2830f42  
    8989<!ENTITY texinfo-mbstate_fix-patch-size "4 KB">
    9090
    91 <!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-4.patch">
    92 <!ENTITY vim-fixes-patch-md5 "0a49b64726c44594c73483b8aa26e121">
    93 <!ENTITY vim-fixes-patch-size "248 KB">
     91<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-1.patch">
     92<!ENTITY vim-branch_update-patch-md5 "375d26a977ebc4e6854f47665a9a184f">
     93<!ENTITY vim-branch_update-patch-size "256 KB">
    9494
    9595<!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">
  • patches/vim-7.1-branch_update-1.patch

    r50f4cec r2830f42  
    11Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
    2 Date: 10-16-2007
     2Date: 10-29-2007
    33Initial Package Version: 7.1
    44Origin: Upstream
    55Upstream Status: Applied
    6 Description: Contains all upstream patches up to 7.1.140
     6Description: Contains all upstream patches up to 7.1.145
    77             The following patches were skipped
    88             003 007 041 065 070 072 080 088 091 092 124 126 128 129 134
     
    1010diff -Naur vim71.orig/runtime/doc/change.txt vim71/runtime/doc/change.txt
    1111--- vim71.orig/runtime/doc/change.txt   2007-05-12 03:18:46.000000000 -0700
    12 +++ vim71/runtime/doc/change.txt        2007-10-16 14:14:06.000000000 -0700
     12+++ vim71/runtime/doc/change.txt        2007-10-29 08:09:16.000000000 -0700
    1313@@ -1571,6 +1571,10 @@
    1414                        in their original order, right before the sorted
     
    2424diff -Naur vim71.orig/runtime/doc/eval.txt vim71/runtime/doc/eval.txt
    2525--- vim71.orig/runtime/doc/eval.txt     2007-05-12 03:18:46.000000000 -0700
    26 +++ vim71/runtime/doc/eval.txt  2007-10-16 14:14:28.000000000 -0700
     26+++ vim71/runtime/doc/eval.txt  2007-10-29 08:09:38.000000000 -0700
    2727@@ -1,4 +1,4 @@
    2828-*eval.txt*      For Vim version 7.1.  Last change: 2007 May 11
     
    252252diff -Naur vim71.orig/runtime/doc/options.txt vim71/runtime/doc/options.txt
    253253--- vim71.orig/runtime/doc/options.txt  2007-05-12 03:18:47.000000000 -0700
    254 +++ vim71/runtime/doc/options.txt       2007-10-16 14:14:12.000000000 -0700
     254+++ vim71/runtime/doc/options.txt       2007-10-29 08:09:23.000000000 -0700
    255255@@ -1,4 +1,4 @@
    256256-*options.txt*  For Vim version 7.1.  Last change: 2007 May 11
     
    272272diff -Naur vim71.orig/runtime/doc/pattern.txt vim71/runtime/doc/pattern.txt
    273273--- vim71.orig/runtime/doc/pattern.txt  2007-05-12 03:18:47.000000000 -0700
    274 +++ vim71/runtime/doc/pattern.txt       2007-10-16 14:14:07.000000000 -0700
     274+++ vim71/runtime/doc/pattern.txt       2007-10-29 08:09:16.000000000 -0700
    275275@@ -1212,7 +1212,10 @@
    276276                {group} must exist at the moment this command is executed.
     
    305305diff -Naur vim71.orig/runtime/doc/pi_paren.txt vim71/runtime/doc/pi_paren.txt
    306306--- vim71.orig/runtime/doc/pi_paren.txt 2007-05-12 03:18:47.000000000 -0700
    307 +++ vim71/runtime/doc/pi_paren.txt      2007-10-16 14:14:20.000000000 -0700
     307+++ vim71/runtime/doc/pi_paren.txt      2007-10-29 08:09:30.000000000 -0700
    308308@@ -12,8 +12,8 @@
    309309 You can avoid loading this plugin by setting the "loaded_matchparen" variable: >
     
    319319diff -Naur vim71.orig/runtime/doc/usr_41.txt vim71/runtime/doc/usr_41.txt
    320320--- vim71.orig/runtime/doc/usr_41.txt   2007-05-12 03:18:48.000000000 -0700
    321 +++ vim71/runtime/doc/usr_41.txt        2007-10-16 14:14:07.000000000 -0700
     321+++ vim71/runtime/doc/usr_41.txt        2007-10-29 08:09:16.000000000 -0700
    322322@@ -763,13 +763,22 @@
    323323        foldtextresult()        get the text displayed for a closed fold
     
    345345diff -Naur vim71.orig/runtime/doc/windows.txt vim71/runtime/doc/windows.txt
    346346--- vim71.orig/runtime/doc/windows.txt  2007-05-12 03:18:49.000000000 -0700
    347 +++ vim71/runtime/doc/windows.txt       2007-10-16 14:14:12.000000000 -0700
     347+++ vim71/runtime/doc/windows.txt       2007-10-29 08:09:23.000000000 -0700
    348348@@ -132,7 +132,8 @@
    349349                the same file.  Make new window N high (default is to use half
     
    375375diff -Naur vim71.orig/runtime/filetype.vim vim71/runtime/filetype.vim
    376376--- vim71.orig/runtime/filetype.vim     2007-05-10 08:14:37.000000000 -0700
    377 +++ vim71/runtime/filetype.vim  2007-10-16 14:14:01.000000000 -0700
     377+++ vim71/runtime/filetype.vim  2007-10-29 08:09:11.000000000 -0700
    378378@@ -1,7 +1,7 @@
    379379 " Vim support file to detect file types
     
    396396diff -Naur vim71.orig/runtime/plugin/matchparen.vim vim71/runtime/plugin/matchparen.vim
    397397--- vim71.orig/runtime/plugin/matchparen.vim    2006-10-12 13:05:05.000000000 -0700
    398 +++ vim71/runtime/plugin/matchparen.vim 2007-10-16 14:14:20.000000000 -0700
     398+++ vim71/runtime/plugin/matchparen.vim 2007-10-29 08:09:30.000000000 -0700
    399399@@ -1,6 +1,6 @@
    400400 " Vim plugin for showing matching parens
     
    478478diff -Naur vim71.orig/src/auto/configure vim71/src/auto/configure
    479479--- vim71.orig/src/auto/configure       2007-05-12 04:49:09.000000000 -0700
    480 +++ vim71/src/auto/configure    2007-10-16 14:14:06.000000000 -0700
     480+++ vim71/src/auto/configure    2007-10-29 08:09:16.000000000 -0700
    481481@@ -3843,7 +3843,9 @@
    482482   fi
     
    492492diff -Naur vim71.orig/src/buffer.c vim71/src/buffer.c
    493493--- vim71.orig/src/buffer.c     2007-05-10 08:25:59.000000000 -0700
    494 +++ vim71/src/buffer.c  2007-10-16 14:14:41.000000000 -0700
     494+++ vim71/src/buffer.c  2007-10-29 08:09:50.000000000 -0700
    495495@@ -171,6 +171,13 @@
    496496            /* Put the cursor on the first line. */
     
    603603diff -Naur vim71.orig/src/charset.c vim71/src/charset.c
    604604--- vim71.orig/src/charset.c    2007-03-24 13:10:37.000000000 -0700
    605 +++ vim71/src/charset.c 2007-10-16 14:14:20.000000000 -0700
     605+++ vim71/src/charset.c 2007-10-29 08:09:30.000000000 -0700
    606606@@ -207,7 +207,10 @@
    607607            }
     
    651651diff -Naur vim71.orig/src/configure.in vim71/src/configure.in
    652652--- vim71.orig/src/configure.in 2007-05-12 02:19:27.000000000 -0700
    653 +++ vim71/src/configure.in      2007-10-16 14:14:06.000000000 -0700
     653+++ vim71/src/configure.in      2007-10-29 08:09:16.000000000 -0700
    654654@@ -423,7 +423,9 @@
    655655   fi
     
    665665diff -Naur vim71.orig/src/diff.c vim71/src/diff.c
    666666--- vim71.orig/src/diff.c       2007-02-15 16:18:41.000000000 -0800
    667 +++ vim71/src/diff.c    2007-10-16 14:14:31.000000000 -0700
    668 @@ -840,11 +840,11 @@
     667+++ vim71/src/diff.c    2007-10-29 08:09:51.000000000 -0700
     668@@ -791,6 +791,9 @@
     669     }
     670     mch_remove(tmp_orig);
     671 
     672+    /* force updating cursor position on screen */
     673+    curwin->w_valid_cursor.lnum = 0;
     674+
     675     diff_redraw(TRUE);
     676 
     677 theend:
     678@@ -840,11 +843,11 @@
    669679                    tmp_orig, tmp_new);
    670680            append_redir(cmd, p_srr, tmp_diff);
     
    680690            vim_free(cmd);
    681691        }
    682 @@ -949,11 +949,11 @@
     692@@ -949,11 +952,11 @@
    683693 # endif
    684694                eap->arg);
     
    694704     }
    695705 
     706@@ -1310,7 +1313,7 @@
     707                    dp->df_count[idx_new] += -off;
     708                off = 0;
     709            }
     710-           for (i = idx_orig; i < idx_new + !notset; ++i)
     711+           for (i = idx_orig; i < idx_new; ++i)
     712                if (curtab->tp_diffbuf[i] != NULL)
     713                    dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
     714                                                       - dp->df_lnum[i] + off;
    696715diff -Naur vim71.orig/src/digraph.c vim71/src/digraph.c
    697716--- vim71.orig/src/digraph.c    2006-05-02 11:24:04.000000000 -0700
    698 +++ vim71/src/digraph.c 2007-10-16 14:14:28.000000000 -0700
     717+++ vim71/src/digraph.c 2007-10-29 08:09:37.000000000 -0700
    699718@@ -2028,7 +2028,7 @@
    700719 
     
    737756diff -Naur vim71.orig/src/edit.c vim71/src/edit.c
    738757--- vim71.orig/src/edit.c       2007-05-07 12:43:55.000000000 -0700
    739 +++ vim71/src/edit.c    2007-10-16 14:14:28.000000000 -0700
    740 @@ -788,7 +788,7 @@
     758+++ vim71/src/edit.c    2007-10-29 08:09:51.000000000 -0700
     759@@ -129,6 +129,7 @@
     760 
     761 static void ins_ctrl_x __ARGS((void));
     762 static int  has_compl_option __ARGS((int dict_opt));
     763+static int  ins_compl_accept_char __ARGS((int c));
     764 static int ins_compl_add __ARGS((char_u *str, int len, int icase, char_u *fname, char_u **cptext, int cdir, int flags, int adup));
     765 static int  ins_compl_equal __ARGS((compl_T *match, char_u *str, int len));
     766 static void ins_compl_longest_match __ARGS((compl_T *match));
     767@@ -754,8 +755,9 @@
     768                    continue;
     769                }
     770 
     771-               /* A printable, non-white character: Add to "compl_leader". */
     772-               if (vim_isprintc(c) && !vim_iswhite(c))
     773+               /* A non-white character that fits in with the current
     774+                * completion: Add to "compl_leader". */
     775+               if (ins_compl_accept_char(c))
     776                {
     777                    ins_compl_addleader(c);
     778                    continue;
     779@@ -788,7 +790,7 @@
    741780            ins_redraw(FALSE);
    742781            ++no_mapping;
     
    747786            --allow_keys;
    748787            if (c != Ctrl_N && c != Ctrl_G && c != Ctrl_O)
    749 @@ -981,7 +981,7 @@
     788@@ -981,7 +983,7 @@
    750789 #ifdef FEAT_NETBEANS_INTG
    751790        case K_F21:     /* NetBeans command */
     
    756795            netbeans_keycommand(i);
    757796            break;
    758 @@ -2057,7 +2057,6 @@
     797@@ -2053,11 +2055,44 @@
     798 }
     799 
     800 /*
     801+ * Return TRUE when character "c" is part of the item currently being
     802+ * completed.  Used to decide whether to abandon complete mode when the menu
     803+ * is visible.
     804+ */
     805+    static int
     806+ins_compl_accept_char(c)
     807+    int c;
     808+{
     809+    if (ctrl_x_mode & CTRL_X_WANT_IDENT)
     810+       /* When expanding an identifier only accept identifier chars. */
     811+       return vim_isIDc(c);
     812+
     813+    switch (ctrl_x_mode)
     814+    {
     815+       case CTRL_X_FILES:
     816+           /* When expanding file name only accept file name chars. But not
     817+            * path separators, so that "proto/<Tab>" expands files in
     818+            * "proto", not "proto/" as a whole */
     819+           return vim_isfilec(c) && !vim_ispathsep(c);
     820+
     821+       case CTRL_X_CMDLINE:
     822+       case CTRL_X_OMNI:
     823+           /* Command line and Omni completion can work with just about any
     824+            * printable character, but do stop at white space. */
     825+           return vim_isprintc(c) && !vim_iswhite(c);
     826+
     827+       case CTRL_X_WHOLE_LINE:
     828+           /* For while line completion a space can be part of the line. */
     829+           return vim_isprintc(c);
     830+    }
     831+    return vim_iswordc(c);
     832+}
     833+
     834+/*
     835  * This is like ins_compl_add(), but if 'ic' and 'inf' are set, then the
    759836  * case of the originally typed text is used, and the case of the completed
    760837  * text is inferred, ie this tries to work out what case you probably wanted
     
    764841     int
    765842 ins_compl_add_infercase(str, len, icase, fname, dir, flags)
    766 @@ -2068,54 +2067,147 @@
     843@@ -2068,54 +2103,147 @@
    767844     int                dir;
    768845     int                flags;
     
    9441021        return ins_compl_add(IObuff, len, icase, fname, NULL, dir,
    9451022                                                                flags, FALSE);
    946 @@ -2842,6 +2934,7 @@
     1023@@ -2842,6 +2970,7 @@
    9471024                        /*
    9481025                         * Add the other matches on the line
     
    9521029                        {
    9531030                            /* Find start of the next word.  Skip white
    954 @@ -2851,7 +2944,7 @@
     1031@@ -2851,7 +2980,7 @@
    9551032                                break;
    9561033                            wstart = ptr;
     
    9611038                            if (has_mbyte)
    9621039                                /* Japanese words may have characters in
    963 @@ -2868,9 +2961,12 @@
     1040@@ -2868,9 +2997,12 @@
    9641041                            else
    9651042 #endif
     
    9771054                    }
    9781055                    if (add_r == OK)
    979 @@ -5128,10 +5224,7 @@
     1056@@ -3032,8 +3164,11 @@
     1057     p = line + curwin->w_cursor.col;
     1058     mb_ptr_back(line, p);
     1059 
     1060-    /* Stop completion when the whole word was deleted. */
     1061-    if ((int)(p - line) - (int)compl_col <= 0)
     1062+    /* Stop completion when the whole word was deleted.  For Omni completion
     1063+     * allow the word to be deleted, we won't match everything. */
     1064+    if ((int)(p - line) - (int)compl_col < 0
     1065+           || ((int)(p - line) - (int)compl_col == 0
     1066+               && (ctrl_x_mode & CTRL_X_OMNI) == 0))
     1067        return K_BS;
     1068 
     1069     /* Deleted more than what was used to find matches or didn't finish
     1070@@ -4495,14 +4630,13 @@
     1071        curs_col = curwin->w_cursor.col;
     1072        compl_pending = 0;
     1073 
     1074-       /* if this same ctrl_x_mode has been interrupted use the text from
     1075+       /* If this same ctrl_x_mode has been interrupted use the text from
     1076         * "compl_startpos" to the cursor as a pattern to add a new word
     1077         * instead of expand the one before the cursor, in word-wise if
     1078-        * "compl_startpos"
     1079-        * is not in the same line as the cursor then fix it (the line has
     1080-        * been split because it was longer than 'tw').  if SOL is set then
     1081-        * skip the previous pattern, a word at the beginning of the line has
     1082-        * been inserted, we'll look for that  -- Acevedo. */
     1083+        * "compl_startpos" is not in the same line as the cursor then fix it
     1084+        * (the line has been split because it was longer than 'tw').  if SOL
     1085+        * is set then skip the previous pattern, a word at the beginning of
     1086+        * the line has been inserted, we'll look for that  -- Acevedo. */
     1087        if ((compl_cont_status & CONT_INTRPT) == CONT_INTRPT
     1088                                            && compl_cont_mode == ctrl_x_mode)
     1089        {
     1090@@ -5128,10 +5262,7 @@
    9801091     i = 0;
    9811092     for (;;)
     
    9891100        if (!(State & CMDLINE)
    9901101 # ifdef FEAT_MBYTE
    991 @@ -7215,6 +7308,8 @@
     1102@@ -7215,6 +7346,8 @@
    9921103                p = ml_get_curline();
    9931104                if (cin_iscase(p) || cin_isscopedecl(p) || cin_islabel(30))
     
    9981109                        && p[curwin->w_cursor.col - 1] == ':'
    9991110                        && p[curwin->w_cursor.col - 2] == ':')
    1000 @@ -7477,7 +7572,7 @@
     1111@@ -7477,7 +7610,7 @@
    10011112      * deleted when ESC is hit.
    10021113      */
     
    10071118     LANGMAP_ADJUST(regname, TRUE);
    10081119 #endif
    1009 @@ -7488,7 +7583,7 @@
     1120@@ -7488,7 +7621,7 @@
    10101121 #ifdef FEAT_CMDL_INFO
    10111122        add_to_showcmd_c(literally);
     
    10161127        LANGMAP_ADJUST(regname, TRUE);
    10171128 #endif
    1018 @@ -7579,7 +7674,7 @@
     1129@@ -7579,7 +7712,7 @@
    10191130      * deleted when ESC is hit.
    10201131      */
     
    10251136     switch (c)
    10261137     {
    1027 @@ -7998,7 +8093,8 @@
     1138@@ -7998,7 +8131,8 @@
    10281139     /*
    10291140      * 0^D and ^^D: remove all indent.
     
    10351146        --curwin->w_cursor.col;
    10361147        (void)del_char(FALSE);          /* delete the '^' or '0' */
    1037 @@ -9257,7 +9353,7 @@
     1148@@ -9257,7 +9391,7 @@
    10381149      * mode message to be deleted when ESC is hit */
    10391150     ++no_mapping;
     
    10441155     --allow_keys;
    10451156     if (IS_SPECIAL(c) || mod_mask)         /* special key */
    1046 @@ -9289,7 +9385,7 @@
     1157@@ -9289,7 +9423,7 @@
    10471158        }
    10481159        ++no_mapping;
     
    10551166diff -Naur vim71.orig/src/eval.c vim71/src/eval.c
    10561167--- vim71.orig/src/eval.c       2007-05-07 12:47:32.000000000 -0700
    1057 +++ vim71/src/eval.c    2007-10-16 14:14:38.000000000 -0700
     1168+++ vim71/src/eval.c    2007-10-29 08:09:48.000000000 -0700
    10581169@@ -369,17 +369,17 @@
    10591170 static int ex_let_vars __ARGS((char_u *arg, typval_T *tv, int copy, int semicolon, int var_count, char_u *nextchars));
     
    21482259diff -Naur vim71.orig/src/ex_cmds.c vim71/src/ex_cmds.c
    21492260--- vim71.orig/src/ex_cmds.c    2007-05-07 12:41:01.000000000 -0700
    2150 +++ vim71/src/ex_cmds.c 2007-10-16 14:14:28.000000000 -0700
     2261+++ vim71/src/ex_cmds.c 2007-10-29 08:09:37.000000000 -0700
    21512262@@ -408,7 +408,11 @@
    21522263                goto sortend;
     
    23182429diff -Naur vim71.orig/src/ex_docmd.c vim71/src/ex_docmd.c
    23192430--- vim71.orig/src/ex_docmd.c   2007-05-07 12:49:38.000000000 -0700
    2320 +++ vim71/src/ex_docmd.c        2007-10-16 14:14:28.000000000 -0700
     2431+++ vim71/src/ex_docmd.c        2007-10-29 08:09:51.000000000 -0700
    23212432@@ -133,6 +133,7 @@
    23222433 static void    get_flags __ARGS((exarg_T *eap));
     
    24922603                break;
    24932604        }
    2494 @@ -10816,12 +10844,13 @@
     2605@@ -8399,21 +8427,17 @@
     2606                    || *arg == '"')
     2607            {
     2608                redir_reg = *arg++;
     2609-               if (*arg == '>' && arg[1] == '>')
     2610+               if (*arg == '>' && arg[1] == '>')  /* append */
     2611                    arg += 2;
     2612-               else if ((*arg == NUL || (*arg == '>' && arg[1] == NUL)) &&
     2613-                        (islower(redir_reg)
     2614-# ifdef FEAT_CLIPBOARD
     2615-                           || redir_reg == '*'
     2616-                           || redir_reg == '+'
     2617-# endif
     2618-                           || redir_reg == '"'))
     2619+               else
     2620                {
     2621+                   /* Can use both "@a" and "@a>". */
     2622                    if (*arg == '>')
     2623                        arg++;
     2624-
     2625-                   /* make register empty */
     2626-                   write_reg_contents(redir_reg, (char_u *)"", -1, FALSE);
     2627+                   /* Make register empty when not using @A-@Z and the
     2628+                    * command is valid. */
     2629+                   if (*arg == NUL && !isupper(redir_reg))
     2630+                       write_reg_contents(redir_reg, (char_u *)"", -1, FALSE);
     2631                }
     2632            }
     2633            if (*arg != NUL)
     2634@@ -10816,12 +10840,13 @@
    24952635     exarg_T    *eap;
    24962636 {
     
    25082648     {
    25092649        EMSG(e_invcmd);
    2510 @@ -10830,13 +10859,7 @@
     2650@@ -10830,13 +10855,7 @@
    25112651 
    25122652     /* First clear any old pattern. */
     
    25232663     if (ends_excmd(*eap->arg))
    25242664        end = eap->arg;
    2525 @@ -10847,15 +10870,7 @@
     2665@@ -10847,15 +10866,7 @@
    25262666     {
    25272667        p = skiptowhite(eap->arg);
     
    25402680        if (*p == NUL)
    25412681        {
    2542 @@ -10879,14 +10894,8 @@
     2682@@ -10879,14 +10890,8 @@
    25432683 
    25442684            c = *end;
     
    25592699diff -Naur vim71.orig/src/ex_eval.c vim71/src/ex_eval.c
    25602700--- vim71.orig/src/ex_eval.c    2007-05-07 12:47:50.000000000 -0700
    2561 +++ vim71/src/ex_eval.c 2007-10-16 14:14:09.000000000 -0700
     2701+++ vim71/src/ex_eval.c 2007-10-29 08:09:18.000000000 -0700
    25622702@@ -1551,7 +1551,7 @@
    25632703                }
     
    25712711diff -Naur vim71.orig/src/ex_getln.c vim71/src/ex_getln.c
    25722712--- vim71.orig/src/ex_getln.c   2007-05-07 12:47:23.000000000 -0700
    2573 +++ vim71/src/ex_getln.c        2007-10-16 14:14:34.000000000 -0700
     2713+++ vim71/src/ex_getln.c        2007-10-29 08:09:43.000000000 -0700
    25742714@@ -268,7 +268,9 @@
    25752715     {
     
    28212961diff -Naur vim71.orig/src/feature.h vim71/src/feature.h
    28222962--- vim71.orig/src/feature.h    2007-05-07 12:33:19.000000000 -0700
    2823 +++ vim71/src/feature.h 2007-10-16 14:14:09.000000000 -0700
     2963+++ vim71/src/feature.h 2007-10-29 08:09:18.000000000 -0700
    28242964@@ -673,7 +673,7 @@
    28252965 # define ESC_CHG_TO_ENG_MODE           /* if defined, when ESC pressed,
     
    28332973diff -Naur vim71.orig/src/fileio.c vim71/src/fileio.c
    28342974--- vim71.orig/src/fileio.c     2007-05-10 04:29:44.000000000 -0700
    2835 +++ vim71/src/fileio.c  2007-10-16 14:14:38.000000000 -0700
     2975+++ vim71/src/fileio.c  2007-10-29 08:09:48.000000000 -0700
    28362976@@ -44,6 +44,10 @@
    28372977 /* Is there any system that doesn't have access()? */
     
    30653205diff -Naur vim71.orig/src/fold.c vim71/src/fold.c
    30663206--- vim71.orig/src/fold.c       2007-05-07 12:46:32.000000000 -0700
    3067 +++ vim71/src/fold.c    2007-10-16 14:14:41.000000000 -0700
     3207+++ vim71/src/fold.c    2007-10-29 08:09:51.000000000 -0700
    30683208@@ -858,7 +858,14 @@
    30693209            || foldmethodIsDiff(wp)
     
    30833223diff -Naur vim71.orig/src/getchar.c vim71/src/getchar.c
    30843224--- vim71.orig/src/getchar.c    2007-05-07 12:18:20.000000000 -0700
    3085 +++ vim71/src/getchar.c 2007-10-16 14:14:28.000000000 -0700
     3225+++ vim71/src/getchar.c 2007-10-29 08:09:37.000000000 -0700
    30863226@@ -1596,8 +1596,16 @@
    30873227                continue;
     
    31273267diff -Naur vim71.orig/src/globals.h vim71/src/globals.h
    31283268--- vim71.orig/src/globals.h    2007-05-07 12:44:26.000000000 -0700
    3129 +++ vim71/src/globals.h 2007-10-16 14:14:31.000000000 -0700
     3269+++ vim71/src/globals.h 2007-10-29 08:09:40.000000000 -0700
    31303270@@ -301,13 +301,17 @@
    31313271 #endif
     
    31673307diff -Naur vim71.orig/src/gui.c vim71/src/gui.c
    31683308--- vim71.orig/src/gui.c        2007-05-07 12:50:55.000000000 -0700
    3169 +++ vim71/src/gui.c     2007-10-16 14:14:28.000000000 -0700
     3309+++ vim71/src/gui.c     2007-10-29 08:09:37.000000000 -0700
    31703310@@ -1080,7 +1080,8 @@
    31713311                cur_width = gui.char_width;
     
    32183358diff -Naur vim71.orig/src/gui_gtk.c vim71/src/gui_gtk.c
    32193359--- vim71.orig/src/gui_gtk.c    2007-05-10 01:37:37.000000000 -0700
    3220 +++ vim71/src/gui_gtk.c 2007-10-16 14:14:12.000000000 -0700
     3360+++ vim71/src/gui_gtk.c 2007-10-29 08:09:23.000000000 -0700
    32213361@@ -53,8 +53,8 @@
    32223362 # ifdef bindtextdomain
     
    32643404diff -Naur vim71.orig/src/gui_gtk_x11.c vim71/src/gui_gtk_x11.c
    32653405--- vim71.orig/src/gui_gtk_x11.c        2007-05-10 01:37:49.000000000 -0700
    3266 +++ vim71/src/gui_gtk_x11.c     2007-10-16 14:14:28.000000000 -0700
     3406+++ vim71/src/gui_gtk_x11.c     2007-10-29 08:09:51.000000000 -0700
    32673407@@ -36,8 +36,8 @@
    32683408 # ifdef bindtextdomain
     
    33373477            }
    33383478 #ifndef HAVE_GTK2
     3479@@ -4032,6 +4044,8 @@
     3480        unsigned int    w, h;
     3481        int             x = 0;
     3482        int             y = 0;
     3483+       guint           pixel_width;
     3484+       guint           pixel_height;
     3485 
     3486        mask = XParseGeometry((char *)gui.geom, &x, &y, &w, &h);
     3487 
     3488@@ -4043,12 +4057,31 @@
     3489                p_window = h - 1;
     3490            Rows = h;
     3491        }
     3492+
     3493+       pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width);
     3494+       pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
     3495+
     3496+#ifdef HAVE_GTK2
     3497+       pixel_width  += get_menu_tool_width();
     3498+       pixel_height += get_menu_tool_height();
     3499+#endif
     3500+
     3501        if (mask & (XValue | YValue))
     3502+       {
     3503+           int w, h;
     3504+           gui_mch_get_screen_dimensions(&w, &h);
     3505+           h += p_ghr + get_menu_tool_height();
     3506+           w += get_menu_tool_width();
     3507+           if (mask & XNegative)
     3508+               x += w - pixel_width;
     3509+           if (mask & YNegative)
     3510+               y += h - pixel_height;
     3511 #ifdef HAVE_GTK2
     3512            gtk_window_move(GTK_WINDOW(gui.mainwin), x, y);
     3513 #else
     3514            gtk_widget_set_uposition(gui.mainwin, x, y);
     3515 #endif
     3516+       }
     3517        vim_free(gui.geom);
     3518        gui.geom = NULL;
     3519 
     3520@@ -4059,14 +4092,6 @@
     3521         */
     3522        if (gtk_socket_id != 0  &&  (mask & WidthValue || mask & HeightValue))
     3523        {
     3524-           guint pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width);
     3525-           guint pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
     3526-
     3527-#ifdef HAVE_GTK2
     3528-           pixel_width  += get_menu_tool_width();
     3529-           pixel_height += get_menu_tool_height();
     3530-#endif
     3531-
     3532            update_window_manager_hints(pixel_width, pixel_height);
     3533            init_window_hints_state = 1;
     3534            g_timeout_add(1000, check_startup_plug_hints, NULL);
    33393535diff -Naur vim71.orig/src/if_cscope.c vim71/src/if_cscope.c
    33403536--- vim71.orig/src/if_cscope.c  2007-03-11 07:29:57.000000000 -0700
    3341 +++ vim71/src/if_cscope.c       2007-10-16 14:14:28.000000000 -0700
     3537+++ vim71/src/if_cscope.c       2007-10-29 08:09:37.000000000 -0700
    33423538@@ -24,11 +24,6 @@
    33433539     /* not UNIX, must be WIN32 */
     
    37503946diff -Naur vim71.orig/src/if_cscope.h vim71/src/if_cscope.h
    37513947--- vim71.orig/src/if_cscope.h  2005-06-30 10:14:22.000000000 -0700
    3752 +++ vim71/src/if_cscope.h       2007-10-16 14:14:28.000000000 -0700
     3948+++ vim71/src/if_cscope.h       2007-10-29 08:09:37.000000000 -0700
    37533949@@ -72,7 +72,7 @@
    37543950     ino_t          st_ino;     /* inode number of cscope db */
     
    37623958diff -Naur vim71.orig/src/if_mzsch.c vim71/src/if_mzsch.c
    37633959--- vim71.orig/src/if_mzsch.c   2007-05-12 04:13:47.000000000 -0700
    3764 +++ vim71/src/if_mzsch.c        2007-10-16 14:14:06.000000000 -0700
     3960+++ vim71/src/if_mzsch.c        2007-10-29 08:09:16.000000000 -0700
    37653961@@ -308,6 +308,8 @@
    37663962 static Scheme_Config *(*dll_scheme_current_config)(void);
     
    38084004diff -Naur vim71.orig/src/if_perl.xs vim71/src/if_perl.xs
    38094005--- vim71.orig/src/if_perl.xs   2006-08-16 05:45:15.000000000 -0700
    3810 +++ vim71/src/if_perl.xs        2007-10-16 14:14:41.000000000 -0700
     4006+++ vim71/src/if_perl.xs        2007-10-29 08:09:51.000000000 -0700
    38114007@@ -40,6 +40,28 @@
    38124008 #    define PERL_SUBVERSION SUBVERSION
     
    38894085diff -Naur vim71.orig/src/if_ruby.c vim71/src/if_ruby.c
    38904086--- vim71.orig/src/if_ruby.c    2007-05-12 02:54:12.000000000 -0700
    3891 +++ vim71/src/if_ruby.c 2007-10-16 14:14:28.000000000 -0700
     4087+++ vim71/src/if_ruby.c 2007-10-29 08:09:37.000000000 -0700
    38924088@@ -789,7 +789,7 @@
    38934089     return get_buffer_line(curbuf, curwin->w_cursor.lnum);
     
    39014097diff -Naur vim71.orig/src/keymap.h vim71/src/keymap.h
    39024098--- vim71.orig/src/keymap.h     2006-08-22 04:38:38.000000000 -0700
    3903 +++ vim71/src/keymap.h  2007-10-16 14:14:28.000000000 -0700
     4099+++ vim71/src/keymap.h  2007-10-29 08:09:37.000000000 -0700
    39044100@@ -254,6 +254,8 @@
    39054101     , KE_DROP          /* DnD data is available */
     
    39224118diff -Naur vim71.orig/src/macros.h vim71/src/macros.h
    39234119--- vim71.orig/src/macros.h     2007-05-07 12:38:22.000000000 -0700
    3924 +++ vim71/src/macros.h  2007-10-16 14:14:17.000000000 -0700
     4120+++ vim71/src/macros.h  2007-10-29 08:09:28.000000000 -0700
    39254121@@ -54,10 +54,12 @@
    39264122 
     
    39404136diff -Naur vim71.orig/src/main.aap vim71/src/main.aap
    39414137--- vim71.orig/src/main.aap     2007-05-07 12:46:43.000000000 -0700
    3942 +++ vim71/src/main.aap  2007-10-16 14:14:28.000000000 -0700
     4138+++ vim71/src/main.aap  2007-10-29 08:09:38.000000000 -0700
    39434139@@ -56,9 +56,16 @@
    39444140     config {virtual} auto/config.h auto/config.aap :
     
    39794175diff -Naur vim71.orig/src/main.c vim71/src/main.c
    39804176--- vim71.orig/src/main.c       2007-05-07 12:38:44.000000000 -0700
    3981 +++ vim71/src/main.c    2007-10-16 14:14:28.000000000 -0700
     4177+++ vim71/src/main.c    2007-10-29 08:09:38.000000000 -0700
    39824178@@ -954,7 +954,8 @@
    39834179     int                cmdwin;     /* TRUE when working in the command-line window */
     
    40684264diff -Naur vim71.orig/src/mbyte.c vim71/src/mbyte.c
    40694265--- vim71.orig/src/mbyte.c      2007-05-07 12:47:09.000000000 -0700
    4070 +++ vim71/src/mbyte.c   2007-10-16 14:14:28.000000000 -0700
     4266+++ vim71/src/mbyte.c   2007-10-29 08:09:37.000000000 -0700
    40714267@@ -1310,20 +1310,26 @@
    40724268 /*
     
    41394335diff -Naur vim71.orig/src/message.c vim71/src/message.c
    41404336--- vim71.orig/src/message.c    2007-05-07 12:31:59.000000000 -0700
    4141 +++ vim71/src/message.c 2007-10-16 14:14:28.000000000 -0700
     4337+++ vim71/src/message.c 2007-10-29 08:09:37.000000000 -0700
    41424338@@ -828,7 +828,7 @@
    41434339                _("Messages maintainer: Bram Moolenaar <Bram@vim.org>"),
     
    42764472diff -Naur vim71.orig/src/misc1.c vim71/src/misc1.c
    42774473--- vim71.orig/src/misc1.c      2007-05-07 12:49:03.000000000 -0700
    4278 +++ vim71/src/misc1.c   2007-10-16 14:14:28.000000000 -0700
     4474+++ vim71/src/misc1.c   2007-10-29 08:09:38.000000000 -0700
    42794475@@ -90,7 +90,7 @@
    42804476  */
     
    45964792diff -Naur vim71.orig/src/misc2.c vim71/src/misc2.c
    45974793--- vim71.orig/src/misc2.c      2007-05-07 12:49:26.000000000 -0700
    4598 +++ vim71/src/misc2.c   2007-10-16 14:14:41.000000000 -0700
     4794+++ vim71/src/misc2.c   2007-10-29 08:09:51.000000000 -0700
    45994795@@ -972,7 +972,7 @@
    46004796        return;
     
    46184814diff -Naur vim71.orig/src/normal.c vim71/src/normal.c
    46194815--- vim71.orig/src/normal.c     2007-05-07 12:34:39.000000000 -0700
    4620 +++ vim71/src/normal.c  2007-10-16 14:14:41.000000000 -0700
     4816+++ vim71/src/normal.c  2007-10-29 08:09:51.000000000 -0700
    46214817@@ -690,13 +690,20 @@
    46224818                ca.count0 = ca.count0 * 10 + (c - '0');
     
    47734969diff -Naur vim71.orig/src/ops.c vim71/src/ops.c
    47744970--- vim71.orig/src/ops.c        2007-05-07 12:33:47.000000000 -0700
    4775 +++ vim71/src/ops.c     2007-10-16 14:14:28.000000000 -0700
     4971+++ vim71/src/ops.c     2007-10-29 08:09:38.000000000 -0700
    47764972@@ -2477,7 +2477,7 @@
    47774973 
     
    48465042diff -Naur vim71.orig/src/option.c vim71/src/option.c
    48475043--- vim71.orig/src/option.c     2007-05-01 04:26:10.000000000 -0700
    4848 +++ vim71/src/option.c  2007-10-16 14:14:38.000000000 -0700
     5044+++ vim71/src/option.c  2007-10-29 08:09:48.000000000 -0700
    48495045@@ -427,6 +427,8 @@
    48505046 #define P_NOGLOB       0x100000L/* do not use local value for global vimrc */
     
    50365232diff -Naur vim71.orig/src/os_unix.c vim71/src/os_unix.c
    50375233--- vim71.orig/src/os_unix.c    2007-05-09 12:41:58.000000000 -0700
    5038 +++ vim71/src/os_unix.c 2007-10-16 14:14:22.000000000 -0700
     5234+++ vim71/src/os_unix.c 2007-10-29 08:09:32.000000000 -0700
    50395235@@ -753,7 +753,8 @@
    50405236     if (signal_stack != NULL)
     
    50725268diff -Naur vim71.orig/src/os_unix.h vim71/src/os_unix.h
    50735269--- vim71.orig/src/os_unix.h    2007-05-07 12:35:05.000000000 -0700
    5074 +++ vim71/src/os_unix.h 2007-10-16 14:14:06.000000000 -0700
     5270+++ vim71/src/os_unix.h 2007-10-29 08:09:16.000000000 -0700
    50755271@@ -508,6 +508,9 @@
    50765272 #if !defined(S_ISFIFO) && defined(S_IFIFO)
     
    50855281diff -Naur vim71.orig/src/popupmnu.c vim71/src/popupmnu.c
    50865282--- vim71.orig/src/popupmnu.c   2007-03-24 13:07:39.000000000 -0700
    5087 +++ vim71/src/popupmnu.c        2007-10-16 14:14:09.000000000 -0700
     5283+++ vim71/src/popupmnu.c        2007-10-29 08:09:18.000000000 -0700
    50885284@@ -75,7 +75,6 @@
    50895285 
     
    53195515diff -Naur vim71.orig/src/proto/charset.pro vim71/src/proto/charset.pro
    53205516--- vim71.orig/src/proto/charset.pro    2007-05-12 03:39:01.000000000 -0700
    5321 +++ vim71/src/proto/charset.pro 2007-10-16 14:14:20.000000000 -0700
     5517+++ vim71/src/proto/charset.pro 2007-10-29 08:09:30.000000000 -0700
    53225518@@ -21,6 +21,7 @@
    53235519 int vim_iswordp __ARGS((char_u *p));
     
    53305526diff -Naur vim71.orig/src/proto/fileio.pro vim71/src/proto/fileio.pro
    53315527--- vim71.orig/src/proto/fileio.pro     2007-05-12 03:39:14.000000000 -0700
    5332 +++ vim71/src/proto/fileio.pro  2007-10-16 14:14:31.000000000 -0700
     5528+++ vim71/src/proto/fileio.pro  2007-10-29 08:09:40.000000000 -0700
    53335529@@ -2,6 +2,7 @@
    53345530 void filemess __ARGS((buf_T *buf, char_u *name, char_u *s, int attr));
     
    53505546diff -Naur vim71.orig/src/proto/getchar.pro vim71/src/proto/getchar.pro
    53515547--- vim71.orig/src/proto/getchar.pro    2007-05-12 03:39:16.000000000 -0700
    5352 +++ vim71/src/proto/getchar.pro 2007-10-16 14:14:28.000000000 -0700
     5548+++ vim71/src/proto/getchar.pro 2007-10-29 08:09:37.000000000 -0700
    53535549@@ -38,6 +38,7 @@
    53545550 void updatescript __ARGS((int c));
     
    53615557diff -Naur vim71.orig/src/proto/if_cscope.pro vim71/src/proto/if_cscope.pro
    53625558--- vim71.orig/src/proto/if_cscope.pro  2007-05-12 03:39:21.000000000 -0700
    5363 +++ vim71/src/proto/if_cscope.pro       2007-10-16 14:14:28.000000000 -0700
     5559+++ vim71/src/proto/if_cscope.pro       2007-10-29 08:09:37.000000000 -0700
    53645560@@ -6,4 +6,5 @@
    53655561 void cs_free_tags __ARGS((void));
     
    53705566diff -Naur vim71.orig/src/proto/mbyte.pro vim71/src/proto/mbyte.pro
    53715567--- vim71.orig/src/proto/mbyte.pro      2007-05-12 03:39:38.000000000 -0700
    5372 +++ vim71/src/proto/mbyte.pro   2007-10-16 14:14:28.000000000 -0700
     5568+++ vim71/src/proto/mbyte.pro   2007-10-29 08:09:37.000000000 -0700
    53735569@@ -12,9 +12,9 @@
    53745570 int utf_ptr2cells __ARGS((char_u *p));
     
    53865582diff -Naur vim71.orig/src/proto/misc1.pro vim71/src/proto/misc1.pro
    53875583--- vim71.orig/src/proto/misc1.pro      2007-05-12 03:39:34.000000000 -0700
    5388 +++ vim71/src/proto/misc1.pro   2007-10-16 14:14:28.000000000 -0700
     5584+++ vim71/src/proto/misc1.pro   2007-10-29 08:09:38.000000000 -0700
    53895585@@ -48,10 +48,11 @@
    53905586 void vim_beep __ARGS((void));
     
    54035599diff -Naur vim71.orig/src/proto/search.pro vim71/src/proto/search.pro
    54045600--- vim71.orig/src/proto/search.pro     2007-05-12 03:39:50.000000000 -0700
    5405 +++ vim71/src/proto/search.pro  2007-10-16 14:14:09.000000000 -0700
     5601+++ vim71/src/proto/search.pro  2007-10-29 08:09:18.000000000 -0700
    54065602@@ -1,6 +1,7 @@
    54075603 /* search.c */
     
    54145610diff -Naur vim71.orig/src/proto/syntax.pro vim71/src/proto/syntax.pro
    54155611--- vim71.orig/src/proto/syntax.pro     2007-05-12 03:39:52.000000000 -0700
    5416 +++ vim71/src/proto/syntax.pro  2007-10-16 14:14:07.000000000 -0700
     5612+++ vim71/src/proto/syntax.pro  2007-10-29 08:09:16.000000000 -0700
    54175613@@ -8,6 +8,8 @@
    54185614 void syntax_clear __ARGS((buf_T *buf));
     
    54265622diff -Naur vim71.orig/src/proto/window.pro vim71/src/proto/window.pro
    54275623--- vim71.orig/src/proto/window.pro     2007-05-12 03:40:00.000000000 -0700
    5428 +++ vim71/src/proto/window.pro  2007-10-16 14:14:07.000000000 -0700
     5624+++ vim71/src/proto/window.pro  2007-10-29 08:09:16.000000000 -0700
    54295625@@ -59,4 +59,8 @@
    54305626 int only_one_window __ARGS((void));
     
    54385634diff -Naur vim71.orig/src/quickfix.c vim71/src/quickfix.c
    54395635--- vim71.orig/src/quickfix.c   2007-02-03 16:50:17.000000000 -0800
    5440 +++ vim71/src/quickfix.c        2007-10-16 14:14:28.000000000 -0700
     5636+++ vim71/src/quickfix.c        2007-10-29 08:09:38.000000000 -0700
    54415637@@ -1612,8 +1612,8 @@
    54425638        }
     
    55075703diff -Naur vim71.orig/src/regexp.c vim71/src/regexp.c
    55085704--- vim71.orig/src/regexp.c     2007-05-07 12:50:03.000000000 -0700
    5509 +++ vim71/src/regexp.c  2007-10-16 14:14:09.000000000 -0700
     5705+++ vim71/src/regexp.c  2007-10-29 08:09:18.000000000 -0700
    55105706@@ -2220,7 +2220,7 @@
    55115707                                break;
     
    56195815diff -Naur vim71.orig/src/screen.c vim71/src/screen.c
    56205816--- vim71.orig/src/screen.c     2007-05-07 12:27:53.000000000 -0700
    5621 +++ vim71/src/screen.c  2007-10-16 14:14:28.000000000 -0700
     5817+++ vim71/src/screen.c  2007-10-29 08:09:38.000000000 -0700
    56225818@@ -100,27 +100,7 @@
    56235819 static int     screen_cur_row, screen_cur_col; /* last known cursor position */
     
    64096605diff -Naur vim71.orig/src/search.c vim71/src/search.c
    64106606--- vim71.orig/src/search.c     2007-05-07 12:42:02.000000000 -0700
    6411 +++ vim71/src/search.c  2007-10-16 14:14:09.000000000 -0700
     6607+++ vim71/src/search.c  2007-10-29 08:09:18.000000000 -0700
    64126608@@ -101,7 +101,6 @@
    64136609 static char_u      *mr_pattern = NULL; /* pattern used by search_regcomp() */
     
    65466742diff -Naur vim71.orig/src/spell.c vim71/src/spell.c
    65476743--- vim71.orig/src/spell.c      2007-05-07 12:48:38.000000000 -0700
    6548 +++ vim71/src/spell.c   2007-10-16 14:14:09.000000000 -0700
     6744+++ vim71/src/spell.c   2007-10-29 08:09:18.000000000 -0700
    65496745@@ -7829,7 +7829,7 @@
    65506746 # if (_MSC_VER <= 1200)
     
    66016797diff -Naur vim71.orig/src/structs.h vim71/src/structs.h
    66026798--- vim71.orig/src/structs.h    2007-05-07 12:50:49.000000000 -0700
    6603 +++ vim71/src/structs.h 2007-10-16 14:14:38.000000000 -0700
     6799+++ vim71/src/structs.h 2007-10-29 08:09:48.000000000 -0700
    66046800@@ -278,6 +278,9 @@
    66056801     linenr_T   ue_lcount;      /* linecount when u_save called */
     
    66866882diff -Naur vim71.orig/src/syntax.c vim71/src/syntax.c
    66876883--- vim71.orig/src/syntax.c     2007-05-07 12:42:55.000000000 -0700
    6688 +++ vim71/src/syntax.c  2007-10-16 14:14:41.000000000 -0700
     6884+++ vim71/src/syntax.c  2007-10-29 08:09:51.000000000 -0700
    66896885@@ -66,8 +66,10 @@
    66906886 #define HL_TABLE() ((struct hl_group *)((highlight_ga.ga_data)))
     
    69407136diff -Naur vim71.orig/src/term.c vim71/src/term.c
    69417137--- vim71.orig/src/term.c       2007-05-07 12:39:11.000000000 -0700
    6942 +++ vim71/src/term.c    2007-10-16 14:14:28.000000000 -0700
     7138+++ vim71/src/term.c    2007-10-29 08:09:37.000000000 -0700
    69437139@@ -4809,6 +4809,8 @@
    69447140            if (num_bytes == -1)
     
    69527148diff -Naur vim71.orig/src/termlib.c vim71/src/termlib.c
    69537149--- vim71.orig/src/termlib.c    2007-05-07 12:39:49.000000000 -0700
    6954 +++ vim71/src/termlib.c 2007-10-16 14:14:09.000000000 -0700
     7150+++ vim71/src/termlib.c 2007-10-29 08:09:18.000000000 -0700
    69557151@@ -191,7 +191,7 @@
    69567152            lbuf[0] == '\t' &&
     
    69647160diff -Naur vim71.orig/src/testdir/Makefile vim71/src/testdir/Makefile
    69657161--- vim71.orig/src/testdir/Makefile     2006-04-30 04:08:01.000000000 -0700
    6966 +++ vim71/src/testdir/Makefile  2007-10-16 14:14:28.000000000 -0700
     7162+++ vim71/src/testdir/Makefile  2007-10-29 08:09:38.000000000 -0700
    69677163@@ -1,9 +1,13 @@
    69687164 #
     
    70257221diff -Naur vim71.orig/src/testdir/test14.in vim71/src/testdir/test14.in
    70267222--- vim71.orig/src/testdir/test14.in    2004-06-07 07:32:05.000000000 -0700
    7027 +++ vim71/src/testdir/test14.in 2007-10-16 14:14:28.000000000 -0700
     7223+++ vim71/src/testdir/test14.in 2007-10-29 08:09:38.000000000 -0700
    70287224@@ -18,6 +18,7 @@
    70297225 : let tt = "o\<C-V>65\<C-V>x42\<C-V>o103 \<C-V>33a\<C-V>xfg\<C-V>o78\<Esc>"
     
    70367232diff -Naur vim71.orig/src/testdir/test26.in vim71/src/testdir/test26.in
    70377233--- vim71.orig/src/testdir/test26.in    2004-06-07 07:32:05.000000000 -0700
    7038 +++ vim71/src/testdir/test26.in 2007-10-16 14:14:28.000000000 -0700
     7234+++ vim71/src/testdir/test26.in 2007-10-29 08:09:38.000000000 -0700
    70397235@@ -37,6 +37,7 @@
    70407236 :    endif
     
    70477243diff -Naur vim71.orig/src/testdir/test34.in vim71/src/testdir/test34.in
    70487244--- vim71.orig/src/testdir/test34.in    2006-04-30 06:33:24.000000000 -0700
    7049 +++ vim71/src/testdir/test34.in 2007-10-16 14:14:28.000000000 -0700
     7245+++ vim71/src/testdir/test34.in 2007-10-29 08:09:38.000000000 -0700
    70507246@@ -52,7 +52,15 @@
    70517247 ---*---
     
    70677263diff -Naur vim71.orig/src/testdir/test45.in vim71/src/testdir/test45.in
    70687264--- vim71.orig/src/testdir/test45.in    2004-06-07 07:32:05.000000000 -0700
    7069 +++ vim71/src/testdir/test45.in 2007-10-16 14:14:28.000000000 -0700
     7265+++ vim71/src/testdir/test45.in 2007-10-29 08:09:38.000000000 -0700
    70707266@@ -55,6 +55,7 @@
    70717267 /kk$
     
    70787274diff -Naur vim71.orig/src/testdir/test47.in vim71/src/testdir/test47.in
    70797275--- vim71.orig/src/testdir/test47.in    2004-06-07 07:32:05.000000000 -0700
    7080 +++ vim71/src/testdir/test47.in 2007-10-16 14:14:28.000000000 -0700
     7276+++ vim71/src/testdir/test47.in 2007-10-29 08:09:38.000000000 -0700
    70817277@@ -34,6 +34,7 @@
    70827278 :call append("$", two)
     
    70897285diff -Naur vim71.orig/src/testdir/test49.in vim71/src/testdir/test49.in
    70907286--- vim71.orig/src/testdir/test49.in    2006-04-28 02:29:54.000000000 -0700
    7091 +++ vim71/src/testdir/test49.in 2007-10-16 14:14:28.000000000 -0700
     7287+++ vim71/src/testdir/test49.in 2007-10-29 08:09:38.000000000 -0700
    70927288@@ -1,13 +1,29 @@
    70937289 This is a test of the script language.
     
    71247320diff -Naur vim71.orig/src/testdir/test55.in vim71/src/testdir/test55.in
    71257321--- vim71.orig/src/testdir/test55.in    2006-10-15 07:07:05.000000000 -0700
    7126 +++ vim71/src/testdir/test55.in 2007-10-16 14:14:28.000000000 -0700
     7322+++ vim71/src/testdir/test55.in 2007-10-29 08:09:38.000000000 -0700
    71277323@@ -345,6 +345,10 @@
    71287324 :endfun
     
    71387334diff -Naur vim71.orig/src/testdir/test56.in vim71/src/testdir/test56.in
    71397335--- vim71.orig/src/testdir/test56.in    2006-09-03 07:28:41.000000000 -0700
    7140 +++ vim71/src/testdir/test56.in 2007-10-16 14:14:28.000000000 -0700
     7336+++ vim71/src/testdir/test56.in 2007-10-29 08:09:38.000000000 -0700
    71417337@@ -17,5 +17,5 @@
    71427338 fun s:DoNothing()
     
    71487344diff -Naur vim71.orig/src/testdir/test58.in vim71/src/testdir/test58.in
    71497345--- vim71.orig/src/testdir/test58.in    2006-04-03 11:24:04.000000000 -0700
    7150 +++ vim71/src/testdir/test58.in 2007-10-16 14:14:28.000000000 -0700
     7346+++ vim71/src/testdir/test58.in 2007-10-29 08:09:38.000000000 -0700
    71517347@@ -86,6 +86,7 @@
    71527348 :$put =str
     
    71707366diff -Naur vim71.orig/src/testdir/test59.in vim71/src/testdir/test59.in
    71717367--- vim71.orig/src/testdir/test59.in    2006-04-03 11:29:24.000000000 -0700
    7172 +++ vim71/src/testdir/test59.in 2007-10-16 14:14:28.000000000 -0700
     7368+++ vim71/src/testdir/test59.in 2007-10-29 08:09:38.000000000 -0700
    71737369@@ -90,6 +90,7 @@
    71747370 :$put =str
     
    71927388diff -Naur vim71.orig/src/testdir/test60.in vim71/src/testdir/test60.in
    71937389--- vim71.orig/src/testdir/test60.in    2006-05-05 11:41:18.000000000 -0700
    7194 +++ vim71/src/testdir/test60.in 2007-10-16 14:14:28.000000000 -0700
     7390+++ vim71/src/testdir/test60.in 2007-10-29 08:09:38.000000000 -0700
    71957391@@ -569,6 +569,9 @@
    71967392     redir END
     
    72057401diff -Naur vim71.orig/src/testdir/test60.vim vim71/src/testdir/test60.vim
    72067402--- vim71.orig/src/testdir/test60.vim   2006-01-12 11:45:59.000000000 -0800
    7207 +++ vim71/src/testdir/test60.vim        2007-10-16 14:14:28.000000000 -0700
     7403+++ vim71/src/testdir/test60.vim        2007-10-29 08:09:38.000000000 -0700
    72087404@@ -94,4 +94,5 @@
    72097405 else
     
    72147410diff -Naur vim71.orig/src/testdir/test62.in vim71/src/testdir/test62.in
    72157411--- vim71.orig/src/testdir/test62.in    2006-04-30 04:29:15.000000000 -0700
    7216 +++ vim71/src/testdir/test62.in 2007-10-16 14:14:28.000000000 -0700
     7412+++ vim71/src/testdir/test62.in 2007-10-29 08:09:38.000000000 -0700
    72177413@@ -7,6 +7,7 @@
    72187414 :let nr = tabpagenr()
     
    72337429diff -Naur vim71.orig/src/testdir/test63.in vim71/src/testdir/test63.in
    72347430--- vim71.orig/src/testdir/test63.in    1969-12-31 16:00:00.000000000 -0800
    7235 +++ vim71/src/testdir/test63.in 2007-10-16 14:14:28.000000000 -0700
     7431+++ vim71/src/testdir/test63.in 2007-10-29 08:09:38.000000000 -0700
    72367432@@ -0,0 +1,157 @@
    72377433+Test for ":match", ":2match", ":3match", "clearmatches()", "getmatches()",
     
    73947590diff -Naur vim71.orig/src/testdir/test63.ok vim71/src/testdir/test63.ok
    73957591--- vim71.orig/src/testdir/test63.ok    1969-12-31 16:00:00.000000000 -0800
    7396 +++ vim71/src/testdir/test63.ok 2007-10-16 14:14:07.000000000 -0700
     7592+++ vim71/src/testdir/test63.ok 2007-10-29 08:09:16.000000000 -0700
    73977593@@ -0,0 +1,11 @@
    73987594+Results of test63:
     
    74097605diff -Naur vim71.orig/src/testdir/test64.in vim71/src/testdir/test64.in
    74107606--- vim71.orig/src/testdir/test64.in    1969-12-31 16:00:00.000000000 -0800
    7411 +++ vim71/src/testdir/test64.in 2007-10-16 14:14:28.000000000 -0700
     7607+++ vim71/src/testdir/test64.in 2007-10-29 08:09:38.000000000 -0700
    74127608@@ -0,0 +1,54 @@
    74137609+Test for regexp patterns.
     
    74677663diff -Naur vim71.orig/src/testdir/test64.ok vim71/src/testdir/test64.ok
    74687664--- vim71.orig/src/testdir/test64.ok    1969-12-31 16:00:00.000000000 -0800
    7469 +++ vim71/src/testdir/test64.ok 2007-10-16 14:14:14.000000000 -0700
     7665+++ vim71/src/testdir/test64.ok 2007-10-29 08:09:25.000000000 -0700
    74707666@@ -0,0 +1,6 @@
    74717667+Results of test64:
     
    74777673diff -Naur vim71.orig/src/ui.c vim71/src/ui.c
    74787674--- vim71.orig/src/ui.c 2007-05-07 12:49:09.000000000 -0700
    7479 +++ vim71/src/ui.c      2007-10-16 14:14:17.000000000 -0700
     7675+++ vim71/src/ui.c      2007-10-29 08:09:28.000000000 -0700
    74807676@@ -1603,8 +1603,6 @@
    74817677 #if defined(FEAT_GUI) || defined(FEAT_MOUSE_GPM) \
     
    75007696diff -Naur vim71.orig/src/undo.c vim71/src/undo.c
    75017697--- vim71.orig/src/undo.c       2007-05-07 12:21:14.000000000 -0700
    7502 +++ vim71/src/undo.c    2007-10-16 14:14:38.000000000 -0700
     7698+++ vim71/src/undo.c    2007-10-29 08:09:48.000000000 -0700
    75037699@@ -76,6 +76,12 @@
    75047700  * buffer is unloaded.
     
    77537949diff -Naur vim71.orig/src/version.c vim71/src/version.c
    77547950--- vim71.orig/src/version.c    2007-05-12 03:23:44.000000000 -0700
    7755 +++ vim71/src/version.c 2007-10-16 14:14:41.000000000 -0700
    7756 @@ -667,6 +667,256 @@
     7951+++ vim71/src/version.c 2007-10-29 08:09:51.000000000 -0700
     7952@@ -667,6 +667,266 @@
    77577953 static int included_patches[] =
    77587954 {   /* Add new patch number below this line */
    77597955 /**/
     7956+    145,
     7957+/**/
     7958+    144,
     7959+/**/
     7960+    143,
     7961+/**/
     7962+    142,
     7963+/**/
     7964+    141,
     7965+/**/
    77607966+    140,
    77617967+/**/
     
    80138219diff -Naur vim71.orig/src/vim.h vim71/src/vim.h
    80148220--- vim71.orig/src/vim.h        2007-05-12 02:53:29.000000000 -0700
    8015 +++ vim71/src/vim.h     2007-10-16 14:14:09.000000000 -0700
     8221+++ vim71/src/vim.h     2007-10-29 08:09:18.000000000 -0700
    80168222@@ -1380,8 +1380,14 @@
    80178223 #endif
     
    80338239diff -Naur vim71.orig/src/vimtutor vim71/src/vimtutor
    80348240--- vim71.orig/src/vimtutor     2004-06-07 07:32:27.000000000 -0700
    8035 +++ vim71/src/vimtutor  2007-10-16 14:14:06.000000000 -0700
     8241+++ vim71/src/vimtutor  2007-10-29 08:09:16.000000000 -0700
    80368242@@ -39,18 +39,22 @@
    80378243 # remove the copy of the tutor on exit
     
    80698275diff -Naur vim71.orig/src/window.c vim71/src/window.c
    80708276--- vim71.orig/src/window.c     2007-05-07 12:25:30.000000000 -0700
    8071 +++ vim71/src/window.c  2007-10-16 14:14:31.000000000 -0700
     8277+++ vim71/src/window.c  2007-10-29 08:09:40.000000000 -0700
    80728278@@ -75,6 +75,7 @@
    80738279 static win_T *restore_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
Note: See TracChangeset for help on using the changeset viewer.