Changeset 2830f42
- Timestamp:
- Oct 29, 2007, 5:29:52 PM (17 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 0f7e9ab
- Parents:
- 50f4cec
- Files:
-
- 4 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
BOOK/final-system/common/vim.xml
r50f4cec r2830f42 38 38 archives into the same directory.</para> 39 39 40 <para os="p1">The following patch contains updates from the maintainer. The41 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> 44 44 45 45 <para os="b">Change the default location of -
BOOK/introduction/common/changelog.xml
r50f4cec r2830f42 42 42 <listitem> 43 43 <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> 44 47 </listitem> 45 48 </itemizedlist> -
BOOK/materials/common/patches.xml
r50f4cec r2830f42 209 209 210 210 <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> 216 216 </listitem> 217 217 </varlistentry> -
BOOK/patches.ent
r50f4cec r2830f42 89 89 <!ENTITY texinfo-mbstate_fix-patch-size "4 KB"> 90 90 91 <!ENTITY vim- fixes-patch "vim-&vim-version;-fixes-4.patch">92 <!ENTITY vim- fixes-patch-md5 "0a49b64726c44594c73483b8aa26e121">93 <!ENTITY vim- fixes-patch-size "248KB">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"> 94 94 95 95 <!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch"> -
patches/vim-7.1-branch_update-1.patch
r50f4cec r2830f42 1 1 Submitted By: Jim Gifford (jim at linuxfromscratch dot org) 2 Date: 10- 16-20072 Date: 10-29-2007 3 3 Initial Package Version: 7.1 4 4 Origin: Upstream 5 5 Upstream Status: Applied 6 Description: Contains all upstream patches up to 7.1.14 06 Description: Contains all upstream patches up to 7.1.145 7 7 The following patches were skipped 8 8 003 007 041 065 070 072 080 088 091 092 124 126 128 129 134 … … 10 10 diff -Naur vim71.orig/runtime/doc/change.txt vim71/runtime/doc/change.txt 11 11 --- 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 -070012 +++ vim71/runtime/doc/change.txt 2007-10-29 08:09:16.000000000 -0700 13 13 @@ -1571,6 +1571,10 @@ 14 14 in their original order, right before the sorted … … 24 24 diff -Naur vim71.orig/runtime/doc/eval.txt vim71/runtime/doc/eval.txt 25 25 --- 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 -070026 +++ vim71/runtime/doc/eval.txt 2007-10-29 08:09:38.000000000 -0700 27 27 @@ -1,4 +1,4 @@ 28 28 -*eval.txt* For Vim version 7.1. Last change: 2007 May 11 … … 252 252 diff -Naur vim71.orig/runtime/doc/options.txt vim71/runtime/doc/options.txt 253 253 --- 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 -0700254 +++ vim71/runtime/doc/options.txt 2007-10-29 08:09:23.000000000 -0700 255 255 @@ -1,4 +1,4 @@ 256 256 -*options.txt* For Vim version 7.1. Last change: 2007 May 11 … … 272 272 diff -Naur vim71.orig/runtime/doc/pattern.txt vim71/runtime/doc/pattern.txt 273 273 --- 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 -0700274 +++ vim71/runtime/doc/pattern.txt 2007-10-29 08:09:16.000000000 -0700 275 275 @@ -1212,7 +1212,10 @@ 276 276 {group} must exist at the moment this command is executed. … … 305 305 diff -Naur vim71.orig/runtime/doc/pi_paren.txt vim71/runtime/doc/pi_paren.txt 306 306 --- 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 -0700307 +++ vim71/runtime/doc/pi_paren.txt 2007-10-29 08:09:30.000000000 -0700 308 308 @@ -12,8 +12,8 @@ 309 309 You can avoid loading this plugin by setting the "loaded_matchparen" variable: > … … 319 319 diff -Naur vim71.orig/runtime/doc/usr_41.txt vim71/runtime/doc/usr_41.txt 320 320 --- 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 -0700321 +++ vim71/runtime/doc/usr_41.txt 2007-10-29 08:09:16.000000000 -0700 322 322 @@ -763,13 +763,22 @@ 323 323 foldtextresult() get the text displayed for a closed fold … … 345 345 diff -Naur vim71.orig/runtime/doc/windows.txt vim71/runtime/doc/windows.txt 346 346 --- 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 -0700347 +++ vim71/runtime/doc/windows.txt 2007-10-29 08:09:23.000000000 -0700 348 348 @@ -132,7 +132,8 @@ 349 349 the same file. Make new window N high (default is to use half … … 375 375 diff -Naur vim71.orig/runtime/filetype.vim vim71/runtime/filetype.vim 376 376 --- 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 -0700377 +++ vim71/runtime/filetype.vim 2007-10-29 08:09:11.000000000 -0700 378 378 @@ -1,7 +1,7 @@ 379 379 " Vim support file to detect file types … … 396 396 diff -Naur vim71.orig/runtime/plugin/matchparen.vim vim71/runtime/plugin/matchparen.vim 397 397 --- 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 -0700398 +++ vim71/runtime/plugin/matchparen.vim 2007-10-29 08:09:30.000000000 -0700 399 399 @@ -1,6 +1,6 @@ 400 400 " Vim plugin for showing matching parens … … 478 478 diff -Naur vim71.orig/src/auto/configure vim71/src/auto/configure 479 479 --- 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 -0700480 +++ vim71/src/auto/configure 2007-10-29 08:09:16.000000000 -0700 481 481 @@ -3843,7 +3843,9 @@ 482 482 fi … … 492 492 diff -Naur vim71.orig/src/buffer.c vim71/src/buffer.c 493 493 --- 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 -0700494 +++ vim71/src/buffer.c 2007-10-29 08:09:50.000000000 -0700 495 495 @@ -171,6 +171,13 @@ 496 496 /* Put the cursor on the first line. */ … … 603 603 diff -Naur vim71.orig/src/charset.c vim71/src/charset.c 604 604 --- 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 -0700605 +++ vim71/src/charset.c 2007-10-29 08:09:30.000000000 -0700 606 606 @@ -207,7 +207,10 @@ 607 607 } … … 651 651 diff -Naur vim71.orig/src/configure.in vim71/src/configure.in 652 652 --- 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 -0700653 +++ vim71/src/configure.in 2007-10-29 08:09:16.000000000 -0700 654 654 @@ -423,7 +423,9 @@ 655 655 fi … … 665 665 diff -Naur vim71.orig/src/diff.c vim71/src/diff.c 666 666 --- 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 @@ 669 679 tmp_orig, tmp_new); 670 680 append_redir(cmd, p_srr, tmp_diff); … … 680 690 vim_free(cmd); 681 691 } 682 @@ -949,11 +9 49,11 @@692 @@ -949,11 +952,11 @@ 683 693 # endif 684 694 eap->arg); … … 694 704 } 695 705 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; 696 715 diff -Naur vim71.orig/src/digraph.c vim71/src/digraph.c 697 716 --- 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 -0700717 +++ vim71/src/digraph.c 2007-10-29 08:09:37.000000000 -0700 699 718 @@ -2028,7 +2028,7 @@ 700 719 … … 737 756 diff -Naur vim71.orig/src/edit.c vim71/src/edit.c 738 757 --- 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 @@ 741 780 ins_redraw(FALSE); 742 781 ++no_mapping; … … 747 786 --allow_keys; 748 787 if (c != Ctrl_N && c != Ctrl_G && c != Ctrl_O) 749 @@ -981,7 +98 1,7 @@788 @@ -981,7 +983,7 @@ 750 789 #ifdef FEAT_NETBEANS_INTG 751 790 case K_F21: /* NetBeans command */ … … 756 795 netbeans_keycommand(i); 757 796 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 759 836 * case of the originally typed text is used, and the case of the completed 760 837 * text is inferred, ie this tries to work out what case you probably wanted … … 764 841 int 765 842 ins_compl_add_infercase(str, len, icase, fname, dir, flags) 766 @@ -2068,54 +2 067,147 @@843 @@ -2068,54 +2103,147 @@ 767 844 int dir; 768 845 int flags; … … 944 1021 return ins_compl_add(IObuff, len, icase, fname, NULL, dir, 945 1022 flags, FALSE); 946 @@ -2842,6 +29 34,7 @@1023 @@ -2842,6 +2970,7 @@ 947 1024 /* 948 1025 * Add the other matches on the line … … 952 1029 { 953 1030 /* Find start of the next word. Skip white 954 @@ -2851,7 +29 44,7 @@1031 @@ -2851,7 +2980,7 @@ 955 1032 break; 956 1033 wstart = ptr; … … 961 1038 if (has_mbyte) 962 1039 /* Japanese words may have characters in 963 @@ -2868,9 +29 61,12 @@1040 @@ -2868,9 +2997,12 @@ 964 1041 else 965 1042 #endif … … 977 1054 } 978 1055 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 @@ 980 1091 i = 0; 981 1092 for (;;) … … 989 1100 if (!(State & CMDLINE) 990 1101 # ifdef FEAT_MBYTE 991 @@ -7215,6 +73 08,8 @@1102 @@ -7215,6 +7346,8 @@ 992 1103 p = ml_get_curline(); 993 1104 if (cin_iscase(p) || cin_isscopedecl(p) || cin_islabel(30)) … … 998 1109 && p[curwin->w_cursor.col - 1] == ':' 999 1110 && p[curwin->w_cursor.col - 2] == ':') 1000 @@ -7477,7 +7 572,7 @@1111 @@ -7477,7 +7610,7 @@ 1001 1112 * deleted when ESC is hit. 1002 1113 */ … … 1007 1118 LANGMAP_ADJUST(regname, TRUE); 1008 1119 #endif 1009 @@ -7488,7 +7 583,7 @@1120 @@ -7488,7 +7621,7 @@ 1010 1121 #ifdef FEAT_CMDL_INFO 1011 1122 add_to_showcmd_c(literally); … … 1016 1127 LANGMAP_ADJUST(regname, TRUE); 1017 1128 #endif 1018 @@ -7579,7 +7 674,7 @@1129 @@ -7579,7 +7712,7 @@ 1019 1130 * deleted when ESC is hit. 1020 1131 */ … … 1025 1136 switch (c) 1026 1137 { 1027 @@ -7998,7 +8 093,8 @@1138 @@ -7998,7 +8131,8 @@ 1028 1139 /* 1029 1140 * 0^D and ^^D: remove all indent. … … 1035 1146 --curwin->w_cursor.col; 1036 1147 (void)del_char(FALSE); /* delete the '^' or '0' */ 1037 @@ -9257,7 +93 53,7 @@1148 @@ -9257,7 +9391,7 @@ 1038 1149 * mode message to be deleted when ESC is hit */ 1039 1150 ++no_mapping; … … 1044 1155 --allow_keys; 1045 1156 if (IS_SPECIAL(c) || mod_mask) /* special key */ 1046 @@ -9289,7 +9 385,7 @@1157 @@ -9289,7 +9423,7 @@ 1047 1158 } 1048 1159 ++no_mapping; … … 1055 1166 diff -Naur vim71.orig/src/eval.c vim71/src/eval.c 1056 1167 --- 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 -07001168 +++ vim71/src/eval.c 2007-10-29 08:09:48.000000000 -0700 1058 1169 @@ -369,17 +369,17 @@ 1059 1170 static int ex_let_vars __ARGS((char_u *arg, typval_T *tv, int copy, int semicolon, int var_count, char_u *nextchars)); … … 2148 2259 diff -Naur vim71.orig/src/ex_cmds.c vim71/src/ex_cmds.c 2149 2260 --- 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 -07002261 +++ vim71/src/ex_cmds.c 2007-10-29 08:09:37.000000000 -0700 2151 2262 @@ -408,7 +408,11 @@ 2152 2263 goto sortend; … … 2318 2429 diff -Naur vim71.orig/src/ex_docmd.c vim71/src/ex_docmd.c 2319 2430 --- 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 -07002431 +++ vim71/src/ex_docmd.c 2007-10-29 08:09:51.000000000 -0700 2321 2432 @@ -133,6 +133,7 @@ 2322 2433 static void get_flags __ARGS((exarg_T *eap)); … … 2492 2603 break; 2493 2604 } 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 @@ 2495 2635 exarg_T *eap; 2496 2636 { … … 2508 2648 { 2509 2649 EMSG(e_invcmd); 2510 @@ -10830,13 +1085 9,7 @@2650 @@ -10830,13 +10855,7 @@ 2511 2651 2512 2652 /* First clear any old pattern. */ … … 2523 2663 if (ends_excmd(*eap->arg)) 2524 2664 end = eap->arg; 2525 @@ -10847,15 +108 70,7 @@2665 @@ -10847,15 +10866,7 @@ 2526 2666 { 2527 2667 p = skiptowhite(eap->arg); … … 2540 2680 if (*p == NUL) 2541 2681 { 2542 @@ -10879,14 +1089 4,8 @@2682 @@ -10879,14 +10890,8 @@ 2543 2683 2544 2684 c = *end; … … 2559 2699 diff -Naur vim71.orig/src/ex_eval.c vim71/src/ex_eval.c 2560 2700 --- 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 -07002701 +++ vim71/src/ex_eval.c 2007-10-29 08:09:18.000000000 -0700 2562 2702 @@ -1551,7 +1551,7 @@ 2563 2703 } … … 2571 2711 diff -Naur vim71.orig/src/ex_getln.c vim71/src/ex_getln.c 2572 2712 --- 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 -07002713 +++ vim71/src/ex_getln.c 2007-10-29 08:09:43.000000000 -0700 2574 2714 @@ -268,7 +268,9 @@ 2575 2715 { … … 2821 2961 diff -Naur vim71.orig/src/feature.h vim71/src/feature.h 2822 2962 --- 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 -07002963 +++ vim71/src/feature.h 2007-10-29 08:09:18.000000000 -0700 2824 2964 @@ -673,7 +673,7 @@ 2825 2965 # define ESC_CHG_TO_ENG_MODE /* if defined, when ESC pressed, … … 2833 2973 diff -Naur vim71.orig/src/fileio.c vim71/src/fileio.c 2834 2974 --- 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 -07002975 +++ vim71/src/fileio.c 2007-10-29 08:09:48.000000000 -0700 2836 2976 @@ -44,6 +44,10 @@ 2837 2977 /* Is there any system that doesn't have access()? */ … … 3065 3205 diff -Naur vim71.orig/src/fold.c vim71/src/fold.c 3066 3206 --- 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 -07003207 +++ vim71/src/fold.c 2007-10-29 08:09:51.000000000 -0700 3068 3208 @@ -858,7 +858,14 @@ 3069 3209 || foldmethodIsDiff(wp) … … 3083 3223 diff -Naur vim71.orig/src/getchar.c vim71/src/getchar.c 3084 3224 --- 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 -07003225 +++ vim71/src/getchar.c 2007-10-29 08:09:37.000000000 -0700 3086 3226 @@ -1596,8 +1596,16 @@ 3087 3227 continue; … … 3127 3267 diff -Naur vim71.orig/src/globals.h vim71/src/globals.h 3128 3268 --- 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 -07003269 +++ vim71/src/globals.h 2007-10-29 08:09:40.000000000 -0700 3130 3270 @@ -301,13 +301,17 @@ 3131 3271 #endif … … 3167 3307 diff -Naur vim71.orig/src/gui.c vim71/src/gui.c 3168 3308 --- 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 -07003309 +++ vim71/src/gui.c 2007-10-29 08:09:37.000000000 -0700 3170 3310 @@ -1080,7 +1080,8 @@ 3171 3311 cur_width = gui.char_width; … … 3218 3358 diff -Naur vim71.orig/src/gui_gtk.c vim71/src/gui_gtk.c 3219 3359 --- 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 -07003360 +++ vim71/src/gui_gtk.c 2007-10-29 08:09:23.000000000 -0700 3221 3361 @@ -53,8 +53,8 @@ 3222 3362 # ifdef bindtextdomain … … 3264 3404 diff -Naur vim71.orig/src/gui_gtk_x11.c vim71/src/gui_gtk_x11.c 3265 3405 --- 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 -07003406 +++ vim71/src/gui_gtk_x11.c 2007-10-29 08:09:51.000000000 -0700 3267 3407 @@ -36,8 +36,8 @@ 3268 3408 # ifdef bindtextdomain … … 3337 3477 } 3338 3478 #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); 3339 3535 diff -Naur vim71.orig/src/if_cscope.c vim71/src/if_cscope.c 3340 3536 --- 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 -07003537 +++ vim71/src/if_cscope.c 2007-10-29 08:09:37.000000000 -0700 3342 3538 @@ -24,11 +24,6 @@ 3343 3539 /* not UNIX, must be WIN32 */ … … 3750 3946 diff -Naur vim71.orig/src/if_cscope.h vim71/src/if_cscope.h 3751 3947 --- 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 -07003948 +++ vim71/src/if_cscope.h 2007-10-29 08:09:37.000000000 -0700 3753 3949 @@ -72,7 +72,7 @@ 3754 3950 ino_t st_ino; /* inode number of cscope db */ … … 3762 3958 diff -Naur vim71.orig/src/if_mzsch.c vim71/src/if_mzsch.c 3763 3959 --- 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 -07003960 +++ vim71/src/if_mzsch.c 2007-10-29 08:09:16.000000000 -0700 3765 3961 @@ -308,6 +308,8 @@ 3766 3962 static Scheme_Config *(*dll_scheme_current_config)(void); … … 3808 4004 diff -Naur vim71.orig/src/if_perl.xs vim71/src/if_perl.xs 3809 4005 --- 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 -07004006 +++ vim71/src/if_perl.xs 2007-10-29 08:09:51.000000000 -0700 3811 4007 @@ -40,6 +40,28 @@ 3812 4008 # define PERL_SUBVERSION SUBVERSION … … 3889 4085 diff -Naur vim71.orig/src/if_ruby.c vim71/src/if_ruby.c 3890 4086 --- 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 -07004087 +++ vim71/src/if_ruby.c 2007-10-29 08:09:37.000000000 -0700 3892 4088 @@ -789,7 +789,7 @@ 3893 4089 return get_buffer_line(curbuf, curwin->w_cursor.lnum); … … 3901 4097 diff -Naur vim71.orig/src/keymap.h vim71/src/keymap.h 3902 4098 --- 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 -07004099 +++ vim71/src/keymap.h 2007-10-29 08:09:37.000000000 -0700 3904 4100 @@ -254,6 +254,8 @@ 3905 4101 , KE_DROP /* DnD data is available */ … … 3922 4118 diff -Naur vim71.orig/src/macros.h vim71/src/macros.h 3923 4119 --- 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 -07004120 +++ vim71/src/macros.h 2007-10-29 08:09:28.000000000 -0700 3925 4121 @@ -54,10 +54,12 @@ 3926 4122 … … 3940 4136 diff -Naur vim71.orig/src/main.aap vim71/src/main.aap 3941 4137 --- 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 -07004138 +++ vim71/src/main.aap 2007-10-29 08:09:38.000000000 -0700 3943 4139 @@ -56,9 +56,16 @@ 3944 4140 config {virtual} auto/config.h auto/config.aap : … … 3979 4175 diff -Naur vim71.orig/src/main.c vim71/src/main.c 3980 4176 --- 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 -07004177 +++ vim71/src/main.c 2007-10-29 08:09:38.000000000 -0700 3982 4178 @@ -954,7 +954,8 @@ 3983 4179 int cmdwin; /* TRUE when working in the command-line window */ … … 4068 4264 diff -Naur vim71.orig/src/mbyte.c vim71/src/mbyte.c 4069 4265 --- 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 -07004266 +++ vim71/src/mbyte.c 2007-10-29 08:09:37.000000000 -0700 4071 4267 @@ -1310,20 +1310,26 @@ 4072 4268 /* … … 4139 4335 diff -Naur vim71.orig/src/message.c vim71/src/message.c 4140 4336 --- 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 -07004337 +++ vim71/src/message.c 2007-10-29 08:09:37.000000000 -0700 4142 4338 @@ -828,7 +828,7 @@ 4143 4339 _("Messages maintainer: Bram Moolenaar <Bram@vim.org>"), … … 4276 4472 diff -Naur vim71.orig/src/misc1.c vim71/src/misc1.c 4277 4473 --- 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 -07004474 +++ vim71/src/misc1.c 2007-10-29 08:09:38.000000000 -0700 4279 4475 @@ -90,7 +90,7 @@ 4280 4476 */ … … 4596 4792 diff -Naur vim71.orig/src/misc2.c vim71/src/misc2.c 4597 4793 --- 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 -07004794 +++ vim71/src/misc2.c 2007-10-29 08:09:51.000000000 -0700 4599 4795 @@ -972,7 +972,7 @@ 4600 4796 return; … … 4618 4814 diff -Naur vim71.orig/src/normal.c vim71/src/normal.c 4619 4815 --- 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 -07004816 +++ vim71/src/normal.c 2007-10-29 08:09:51.000000000 -0700 4621 4817 @@ -690,13 +690,20 @@ 4622 4818 ca.count0 = ca.count0 * 10 + (c - '0'); … … 4773 4969 diff -Naur vim71.orig/src/ops.c vim71/src/ops.c 4774 4970 --- 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 -07004971 +++ vim71/src/ops.c 2007-10-29 08:09:38.000000000 -0700 4776 4972 @@ -2477,7 +2477,7 @@ 4777 4973 … … 4846 5042 diff -Naur vim71.orig/src/option.c vim71/src/option.c 4847 5043 --- 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 -07005044 +++ vim71/src/option.c 2007-10-29 08:09:48.000000000 -0700 4849 5045 @@ -427,6 +427,8 @@ 4850 5046 #define P_NOGLOB 0x100000L/* do not use local value for global vimrc */ … … 5036 5232 diff -Naur vim71.orig/src/os_unix.c vim71/src/os_unix.c 5037 5233 --- 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 -07005234 +++ vim71/src/os_unix.c 2007-10-29 08:09:32.000000000 -0700 5039 5235 @@ -753,7 +753,8 @@ 5040 5236 if (signal_stack != NULL) … … 5072 5268 diff -Naur vim71.orig/src/os_unix.h vim71/src/os_unix.h 5073 5269 --- 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 -07005270 +++ vim71/src/os_unix.h 2007-10-29 08:09:16.000000000 -0700 5075 5271 @@ -508,6 +508,9 @@ 5076 5272 #if !defined(S_ISFIFO) && defined(S_IFIFO) … … 5085 5281 diff -Naur vim71.orig/src/popupmnu.c vim71/src/popupmnu.c 5086 5282 --- 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 -07005283 +++ vim71/src/popupmnu.c 2007-10-29 08:09:18.000000000 -0700 5088 5284 @@ -75,7 +75,6 @@ 5089 5285 … … 5319 5515 diff -Naur vim71.orig/src/proto/charset.pro vim71/src/proto/charset.pro 5320 5516 --- 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 -07005517 +++ vim71/src/proto/charset.pro 2007-10-29 08:09:30.000000000 -0700 5322 5518 @@ -21,6 +21,7 @@ 5323 5519 int vim_iswordp __ARGS((char_u *p)); … … 5330 5526 diff -Naur vim71.orig/src/proto/fileio.pro vim71/src/proto/fileio.pro 5331 5527 --- 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 -07005528 +++ vim71/src/proto/fileio.pro 2007-10-29 08:09:40.000000000 -0700 5333 5529 @@ -2,6 +2,7 @@ 5334 5530 void filemess __ARGS((buf_T *buf, char_u *name, char_u *s, int attr)); … … 5350 5546 diff -Naur vim71.orig/src/proto/getchar.pro vim71/src/proto/getchar.pro 5351 5547 --- 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 -07005548 +++ vim71/src/proto/getchar.pro 2007-10-29 08:09:37.000000000 -0700 5353 5549 @@ -38,6 +38,7 @@ 5354 5550 void updatescript __ARGS((int c)); … … 5361 5557 diff -Naur vim71.orig/src/proto/if_cscope.pro vim71/src/proto/if_cscope.pro 5362 5558 --- 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 -07005559 +++ vim71/src/proto/if_cscope.pro 2007-10-29 08:09:37.000000000 -0700 5364 5560 @@ -6,4 +6,5 @@ 5365 5561 void cs_free_tags __ARGS((void)); … … 5370 5566 diff -Naur vim71.orig/src/proto/mbyte.pro vim71/src/proto/mbyte.pro 5371 5567 --- 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 -07005568 +++ vim71/src/proto/mbyte.pro 2007-10-29 08:09:37.000000000 -0700 5373 5569 @@ -12,9 +12,9 @@ 5374 5570 int utf_ptr2cells __ARGS((char_u *p)); … … 5386 5582 diff -Naur vim71.orig/src/proto/misc1.pro vim71/src/proto/misc1.pro 5387 5583 --- 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 -07005584 +++ vim71/src/proto/misc1.pro 2007-10-29 08:09:38.000000000 -0700 5389 5585 @@ -48,10 +48,11 @@ 5390 5586 void vim_beep __ARGS((void)); … … 5403 5599 diff -Naur vim71.orig/src/proto/search.pro vim71/src/proto/search.pro 5404 5600 --- 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 -07005601 +++ vim71/src/proto/search.pro 2007-10-29 08:09:18.000000000 -0700 5406 5602 @@ -1,6 +1,7 @@ 5407 5603 /* search.c */ … … 5414 5610 diff -Naur vim71.orig/src/proto/syntax.pro vim71/src/proto/syntax.pro 5415 5611 --- 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 -07005612 +++ vim71/src/proto/syntax.pro 2007-10-29 08:09:16.000000000 -0700 5417 5613 @@ -8,6 +8,8 @@ 5418 5614 void syntax_clear __ARGS((buf_T *buf)); … … 5426 5622 diff -Naur vim71.orig/src/proto/window.pro vim71/src/proto/window.pro 5427 5623 --- 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 -07005624 +++ vim71/src/proto/window.pro 2007-10-29 08:09:16.000000000 -0700 5429 5625 @@ -59,4 +59,8 @@ 5430 5626 int only_one_window __ARGS((void)); … … 5438 5634 diff -Naur vim71.orig/src/quickfix.c vim71/src/quickfix.c 5439 5635 --- 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 -07005636 +++ vim71/src/quickfix.c 2007-10-29 08:09:38.000000000 -0700 5441 5637 @@ -1612,8 +1612,8 @@ 5442 5638 } … … 5507 5703 diff -Naur vim71.orig/src/regexp.c vim71/src/regexp.c 5508 5704 --- 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 -07005705 +++ vim71/src/regexp.c 2007-10-29 08:09:18.000000000 -0700 5510 5706 @@ -2220,7 +2220,7 @@ 5511 5707 break; … … 5619 5815 diff -Naur vim71.orig/src/screen.c vim71/src/screen.c 5620 5816 --- 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 -07005817 +++ vim71/src/screen.c 2007-10-29 08:09:38.000000000 -0700 5622 5818 @@ -100,27 +100,7 @@ 5623 5819 static int screen_cur_row, screen_cur_col; /* last known cursor position */ … … 6409 6605 diff -Naur vim71.orig/src/search.c vim71/src/search.c 6410 6606 --- 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 -07006607 +++ vim71/src/search.c 2007-10-29 08:09:18.000000000 -0700 6412 6608 @@ -101,7 +101,6 @@ 6413 6609 static char_u *mr_pattern = NULL; /* pattern used by search_regcomp() */ … … 6546 6742 diff -Naur vim71.orig/src/spell.c vim71/src/spell.c 6547 6743 --- 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 -07006744 +++ vim71/src/spell.c 2007-10-29 08:09:18.000000000 -0700 6549 6745 @@ -7829,7 +7829,7 @@ 6550 6746 # if (_MSC_VER <= 1200) … … 6601 6797 diff -Naur vim71.orig/src/structs.h vim71/src/structs.h 6602 6798 --- 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 -07006799 +++ vim71/src/structs.h 2007-10-29 08:09:48.000000000 -0700 6604 6800 @@ -278,6 +278,9 @@ 6605 6801 linenr_T ue_lcount; /* linecount when u_save called */ … … 6686 6882 diff -Naur vim71.orig/src/syntax.c vim71/src/syntax.c 6687 6883 --- 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 -07006884 +++ vim71/src/syntax.c 2007-10-29 08:09:51.000000000 -0700 6689 6885 @@ -66,8 +66,10 @@ 6690 6886 #define HL_TABLE() ((struct hl_group *)((highlight_ga.ga_data))) … … 6940 7136 diff -Naur vim71.orig/src/term.c vim71/src/term.c 6941 7137 --- 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 -07007138 +++ vim71/src/term.c 2007-10-29 08:09:37.000000000 -0700 6943 7139 @@ -4809,6 +4809,8 @@ 6944 7140 if (num_bytes == -1) … … 6952 7148 diff -Naur vim71.orig/src/termlib.c vim71/src/termlib.c 6953 7149 --- 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 -07007150 +++ vim71/src/termlib.c 2007-10-29 08:09:18.000000000 -0700 6955 7151 @@ -191,7 +191,7 @@ 6956 7152 lbuf[0] == '\t' && … … 6964 7160 diff -Naur vim71.orig/src/testdir/Makefile vim71/src/testdir/Makefile 6965 7161 --- 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 -07007162 +++ vim71/src/testdir/Makefile 2007-10-29 08:09:38.000000000 -0700 6967 7163 @@ -1,9 +1,13 @@ 6968 7164 # … … 7025 7221 diff -Naur vim71.orig/src/testdir/test14.in vim71/src/testdir/test14.in 7026 7222 --- 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 -07007223 +++ vim71/src/testdir/test14.in 2007-10-29 08:09:38.000000000 -0700 7028 7224 @@ -18,6 +18,7 @@ 7029 7225 : let tt = "o\<C-V>65\<C-V>x42\<C-V>o103 \<C-V>33a\<C-V>xfg\<C-V>o78\<Esc>" … … 7036 7232 diff -Naur vim71.orig/src/testdir/test26.in vim71/src/testdir/test26.in 7037 7233 --- 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 -07007234 +++ vim71/src/testdir/test26.in 2007-10-29 08:09:38.000000000 -0700 7039 7235 @@ -37,6 +37,7 @@ 7040 7236 : endif … … 7047 7243 diff -Naur vim71.orig/src/testdir/test34.in vim71/src/testdir/test34.in 7048 7244 --- 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 -07007245 +++ vim71/src/testdir/test34.in 2007-10-29 08:09:38.000000000 -0700 7050 7246 @@ -52,7 +52,15 @@ 7051 7247 ---*--- … … 7067 7263 diff -Naur vim71.orig/src/testdir/test45.in vim71/src/testdir/test45.in 7068 7264 --- 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 -07007265 +++ vim71/src/testdir/test45.in 2007-10-29 08:09:38.000000000 -0700 7070 7266 @@ -55,6 +55,7 @@ 7071 7267 /kk$ … … 7078 7274 diff -Naur vim71.orig/src/testdir/test47.in vim71/src/testdir/test47.in 7079 7275 --- 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 -07007276 +++ vim71/src/testdir/test47.in 2007-10-29 08:09:38.000000000 -0700 7081 7277 @@ -34,6 +34,7 @@ 7082 7278 :call append("$", two) … … 7089 7285 diff -Naur vim71.orig/src/testdir/test49.in vim71/src/testdir/test49.in 7090 7286 --- 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 -07007287 +++ vim71/src/testdir/test49.in 2007-10-29 08:09:38.000000000 -0700 7092 7288 @@ -1,13 +1,29 @@ 7093 7289 This is a test of the script language. … … 7124 7320 diff -Naur vim71.orig/src/testdir/test55.in vim71/src/testdir/test55.in 7125 7321 --- 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 -07007322 +++ vim71/src/testdir/test55.in 2007-10-29 08:09:38.000000000 -0700 7127 7323 @@ -345,6 +345,10 @@ 7128 7324 :endfun … … 7138 7334 diff -Naur vim71.orig/src/testdir/test56.in vim71/src/testdir/test56.in 7139 7335 --- 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 -07007336 +++ vim71/src/testdir/test56.in 2007-10-29 08:09:38.000000000 -0700 7141 7337 @@ -17,5 +17,5 @@ 7142 7338 fun s:DoNothing() … … 7148 7344 diff -Naur vim71.orig/src/testdir/test58.in vim71/src/testdir/test58.in 7149 7345 --- 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 -07007346 +++ vim71/src/testdir/test58.in 2007-10-29 08:09:38.000000000 -0700 7151 7347 @@ -86,6 +86,7 @@ 7152 7348 :$put =str … … 7170 7366 diff -Naur vim71.orig/src/testdir/test59.in vim71/src/testdir/test59.in 7171 7367 --- 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 -07007368 +++ vim71/src/testdir/test59.in 2007-10-29 08:09:38.000000000 -0700 7173 7369 @@ -90,6 +90,7 @@ 7174 7370 :$put =str … … 7192 7388 diff -Naur vim71.orig/src/testdir/test60.in vim71/src/testdir/test60.in 7193 7389 --- 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 -07007390 +++ vim71/src/testdir/test60.in 2007-10-29 08:09:38.000000000 -0700 7195 7391 @@ -569,6 +569,9 @@ 7196 7392 redir END … … 7205 7401 diff -Naur vim71.orig/src/testdir/test60.vim vim71/src/testdir/test60.vim 7206 7402 --- 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 -07007403 +++ vim71/src/testdir/test60.vim 2007-10-29 08:09:38.000000000 -0700 7208 7404 @@ -94,4 +94,5 @@ 7209 7405 else … … 7214 7410 diff -Naur vim71.orig/src/testdir/test62.in vim71/src/testdir/test62.in 7215 7411 --- 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 -07007412 +++ vim71/src/testdir/test62.in 2007-10-29 08:09:38.000000000 -0700 7217 7413 @@ -7,6 +7,7 @@ 7218 7414 :let nr = tabpagenr() … … 7233 7429 diff -Naur vim71.orig/src/testdir/test63.in vim71/src/testdir/test63.in 7234 7430 --- 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 -07007431 +++ vim71/src/testdir/test63.in 2007-10-29 08:09:38.000000000 -0700 7236 7432 @@ -0,0 +1,157 @@ 7237 7433 +Test for ":match", ":2match", ":3match", "clearmatches()", "getmatches()", … … 7394 7590 diff -Naur vim71.orig/src/testdir/test63.ok vim71/src/testdir/test63.ok 7395 7591 --- 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 -07007592 +++ vim71/src/testdir/test63.ok 2007-10-29 08:09:16.000000000 -0700 7397 7593 @@ -0,0 +1,11 @@ 7398 7594 +Results of test63: … … 7409 7605 diff -Naur vim71.orig/src/testdir/test64.in vim71/src/testdir/test64.in 7410 7606 --- 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 -07007607 +++ vim71/src/testdir/test64.in 2007-10-29 08:09:38.000000000 -0700 7412 7608 @@ -0,0 +1,54 @@ 7413 7609 +Test for regexp patterns. … … 7467 7663 diff -Naur vim71.orig/src/testdir/test64.ok vim71/src/testdir/test64.ok 7468 7664 --- 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 -07007665 +++ vim71/src/testdir/test64.ok 2007-10-29 08:09:25.000000000 -0700 7470 7666 @@ -0,0 +1,6 @@ 7471 7667 +Results of test64: … … 7477 7673 diff -Naur vim71.orig/src/ui.c vim71/src/ui.c 7478 7674 --- 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 -07007675 +++ vim71/src/ui.c 2007-10-29 08:09:28.000000000 -0700 7480 7676 @@ -1603,8 +1603,6 @@ 7481 7677 #if defined(FEAT_GUI) || defined(FEAT_MOUSE_GPM) \ … … 7500 7696 diff -Naur vim71.orig/src/undo.c vim71/src/undo.c 7501 7697 --- 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 -07007698 +++ vim71/src/undo.c 2007-10-29 08:09:48.000000000 -0700 7503 7699 @@ -76,6 +76,12 @@ 7504 7700 * buffer is unloaded. … … 7753 7949 diff -Naur vim71.orig/src/version.c vim71/src/version.c 7754 7950 --- 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 -07007756 @@ -667,6 +667,2 56 @@7951 +++ vim71/src/version.c 2007-10-29 08:09:51.000000000 -0700 7952 @@ -667,6 +667,266 @@ 7757 7953 static int included_patches[] = 7758 7954 { /* Add new patch number below this line */ 7759 7955 /**/ 7956 + 145, 7957 +/**/ 7958 + 144, 7959 +/**/ 7960 + 143, 7961 +/**/ 7962 + 142, 7963 +/**/ 7964 + 141, 7965 +/**/ 7760 7966 + 140, 7761 7967 +/**/ … … 8013 8219 diff -Naur vim71.orig/src/vim.h vim71/src/vim.h 8014 8220 --- 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 -07008221 +++ vim71/src/vim.h 2007-10-29 08:09:18.000000000 -0700 8016 8222 @@ -1380,8 +1380,14 @@ 8017 8223 #endif … … 8033 8239 diff -Naur vim71.orig/src/vimtutor vim71/src/vimtutor 8034 8240 --- vim71.orig/src/vimtutor 2004-06-07 07:32:27.000000000 -0700 8035 +++ vim71/src/vimtutor 2007-10- 16 14:14:06.000000000 -07008241 +++ vim71/src/vimtutor 2007-10-29 08:09:16.000000000 -0700 8036 8242 @@ -39,18 +39,22 @@ 8037 8243 # remove the copy of the tutor on exit … … 8069 8275 diff -Naur vim71.orig/src/window.c vim71/src/window.c 8070 8276 --- 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 -07008277 +++ vim71/src/window.c 2007-10-29 08:09:40.000000000 -0700 8072 8278 @@ -75,6 +75,7 @@ 8073 8279 static win_T *restore_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
Note:
See TracChangeset
for help on using the changeset viewer.