Changeset 24c015b in clfs-sysroot
- Timestamp:
- Dec 12, 2006, 2:17:42 AM (18 years ago)
- Branches:
- master
- Children:
- 8769017
- Parents:
- 5ed871a
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
patches/vim-7.0-fixes-21.patch
r5ed871a r24c015b 1 1 Submitted By: Jim Gifford (jim at linuxfromscratch dot org) 2 Date: 1 1-29-20062 Date: 12-05-2006 3 3 Initial Package Version: 7.0 4 4 Origin: Upstream 5 5 Upstream Status: Applied 6 Description: Contains all upstream patches up to 7.0.17 46 Description: Contains all upstream patches up to 7.0.178 7 7 The following patches were skipped 8 8 005 027 028 032 045 057 065 074 108 130 131 132 138 156 161 170 171 … … 10 10 diff -Naur vim70.orig/configure vim70/configure 11 11 --- vim70.orig/configure 2004-07-05 02:02:24.000000000 -0700 12 +++ vim70/configure 2006-1 1-29 16:09:55.000000000 -080012 +++ vim70/configure 2006-12-05 19:57:51.000000000 -0800 13 13 @@ -3,4 +3,4 @@ 14 14 # This is just a stub for the Unix configure script, to provide support for … … 19 19 diff -Naur vim70.orig/runtime/autoload/ccomplete.vim vim70/runtime/autoload/ccomplete.vim 20 20 --- vim70.orig/runtime/autoload/ccomplete.vim 2006-05-03 07:35:56.000000000 -0700 21 +++ vim70/runtime/autoload/ccomplete.vim 2006-1 1-29 16:09:49.000000000 -080021 +++ vim70/runtime/autoload/ccomplete.vim 2006-12-05 19:57:40.000000000 -0800 22 22 @@ -1,7 +1,7 @@ 23 23 " Vim completion script … … 40 40 diff -Naur vim70.orig/runtime/autoload/gzip.vim vim70/runtime/autoload/gzip.vim 41 41 --- vim70.orig/runtime/autoload/gzip.vim 2006-03-31 07:12:15.000000000 -0800 42 +++ vim70/runtime/autoload/gzip.vim 2006-1 1-29 16:10:07.000000000 -080042 +++ vim70/runtime/autoload/gzip.vim 2006-12-05 19:58:04.000000000 -0800 43 43 @@ -1,6 +1,6 @@ 44 44 " Vim autoload file for editing compressed files. … … 101 101 diff -Naur vim70.orig/runtime/autoload/paste.vim vim70/runtime/autoload/paste.vim 102 102 --- vim70.orig/runtime/autoload/paste.vim 2006-04-21 11:31:01.000000000 -0700 103 +++ vim70/runtime/autoload/paste.vim 2006-1 1-29 16:09:53.000000000 -0800103 +++ vim70/runtime/autoload/paste.vim 2006-12-05 19:57:46.000000000 -0800 104 104 @@ -1,6 +1,6 @@ 105 105 " Vim support file to help with paste mappings and menus … … 121 121 diff -Naur vim70.orig/runtime/autoload/spellfile.vim vim70/runtime/autoload/spellfile.vim 122 122 --- vim70.orig/runtime/autoload/spellfile.vim 2006-02-01 04:12:24.000000000 -0800 123 +++ vim70/runtime/autoload/spellfile.vim 2006-1 1-29 16:10:01.000000000 -0800123 +++ vim70/runtime/autoload/spellfile.vim 2006-12-05 19:57:58.000000000 -0800 124 124 @@ -1,9 +1,9 @@ 125 125 " Vim script to download a missing spell file … … 177 177 diff -Naur vim70.orig/runtime/doc/eval.txt vim70/runtime/doc/eval.txt 178 178 --- vim70.orig/runtime/doc/eval.txt 2006-05-07 05:16:44.000000000 -0700 179 +++ vim70/runtime/doc/eval.txt 2006-1 1-29 16:10:14.000000000 -0800179 +++ vim70/runtime/doc/eval.txt 2006-12-05 19:58:10.000000000 -0800 180 180 @@ -1,4 +1,4 @@ 181 181 -*eval.txt* For Vim version 7.0. Last change: 2006 May 06 … … 257 257 diff -Naur vim70.orig/runtime/doc/netbeans.txt vim70/runtime/doc/netbeans.txt 258 258 --- vim70.orig/runtime/doc/netbeans.txt 2006-05-07 05:16:45.000000000 -0700 259 +++ vim70/runtime/doc/netbeans.txt 2006-1 1-29 16:10:15.000000000 -0800259 +++ vim70/runtime/doc/netbeans.txt 2006-12-05 19:58:11.000000000 -0800 260 260 @@ -1,4 +1,4 @@ 261 261 -*netbeans.txt* For Vim version 7.0. Last change: 2006 Mar 09 … … 293 293 diff -Naur vim70.orig/runtime/menu.vim vim70/runtime/menu.vim 294 294 --- vim70.orig/runtime/menu.vim 2006-04-17 06:47:28.000000000 -0700 295 +++ vim70/runtime/menu.vim 2006-1 1-29 16:10:06.000000000 -0800295 +++ vim70/runtime/menu.vim 2006-12-05 19:58:04.000000000 -0800 296 296 @@ -2,7 +2,7 @@ 297 297 " You can also use this as a start for your own set of menus. … … 360 360 diff -Naur vim70.orig/runtime/plugin/matchparen.vim vim70/runtime/plugin/matchparen.vim 361 361 --- vim70.orig/runtime/plugin/matchparen.vim 2006-04-27 06:31:26.000000000 -0700 362 +++ vim70/runtime/plugin/matchparen.vim 2006-1 1-29 16:10:05.000000000 -0800362 +++ vim70/runtime/plugin/matchparen.vim 2006-12-05 19:58:01.000000000 -0800 363 363 @@ -1,6 +1,6 @@ 364 364 " Vim plugin for showing matching parens … … 403 403 diff -Naur vim70.orig/runtime/scripts.vim vim70/runtime/scripts.vim 404 404 --- vim70.orig/runtime/scripts.vim 2006-03-28 11:30:49.000000000 -0800 405 +++ vim70/runtime/scripts.vim 2006-1 1-29 16:09:55.000000000 -0800405 +++ vim70/runtime/scripts.vim 2006-12-05 19:57:51.000000000 -0800 406 406 @@ -1,7 +1,7 @@ 407 407 " Vim support file to detect file types in scripts … … 428 428 diff -Naur vim70.orig/runtime/tutor/Makefile vim70/runtime/tutor/Makefile 429 429 --- vim70.orig/runtime/tutor/Makefile 2004-06-07 07:32:39.000000000 -0700 430 +++ vim70/runtime/tutor/Makefile 2006-1 1-29 16:10:05.000000000 -0800430 +++ vim70/runtime/tutor/Makefile 2006-12-05 19:58:01.000000000 -0800 431 431 @@ -2,8 +2,13 @@ 432 432 # … … 462 462 diff -Naur vim70.orig/runtime/tutor/tutor.gr.utf-8 vim70/runtime/tutor/tutor.gr.utf-8 463 463 --- vim70.orig/runtime/tutor/tutor.gr.utf-8 1969-12-31 16:00:00.000000000 -0800 464 +++ vim70/runtime/tutor/tutor.gr.utf-8 2006-1 1-29 16:10:05.000000000 -0800464 +++ vim70/runtime/tutor/tutor.gr.utf-8 2006-12-05 19:58:01.000000000 -0800 465 465 @@ -0,0 +1,815 @@ 466 466 +=============================================================================== … … 1495 1495 diff -Naur vim70.orig/runtime/tutor/tutor.ru.utf-8 vim70/runtime/tutor/tutor.ru.utf-8 1496 1496 --- vim70.orig/runtime/tutor/tutor.ru.utf-8 1969-12-31 16:00:00.000000000 -0800 1497 +++ vim70/runtime/tutor/tutor.ru.utf-8 2006-1 1-29 16:10:01.000000000 -08001497 +++ vim70/runtime/tutor/tutor.ru.utf-8 2006-12-05 19:57:59.000000000 -0800 1498 1498 @@ -0,0 +1,834 @@ 1499 1499 +=============================================================================== … … 2416 2416 diff -Naur vim70.orig/runtime/tutor/tutor.vim vim70/runtime/tutor/tutor.vim 2417 2417 --- vim70.orig/runtime/tutor/tutor.vim 2006-03-18 12:20:36.000000000 -0800 2418 +++ vim70/runtime/tutor/tutor.vim 2006-1 1-29 16:10:05.000000000 -08002418 +++ vim70/runtime/tutor/tutor.vim 2006-12-05 19:58:01.000000000 -0800 2419 2419 @@ -1,6 +1,6 @@ 2420 2420 " Vim tutor support file … … 2468 2468 diff -Naur vim70.orig/src/auto/configure vim70/src/auto/configure 2469 2469 --- vim70.orig/src/auto/configure 2006-05-04 03:46:19.000000000 -0700 2470 +++ vim70/src/auto/configure 2006-1 1-29 16:10:11.000000000 -08002470 +++ vim70/src/auto/configure 2006-12-05 19:58:07.000000000 -0800 2471 2471 @@ -4014,7 +4014,7 @@ 2472 2472 LDFLAGS=$ldflags_save … … 2509 2509 diff -Naur vim70.orig/src/buffer.c vim70/src/buffer.c 2510 2510 --- vim70.orig/src/buffer.c 2006-04-26 14:37:23.000000000 -0700 2511 +++ vim70/src/buffer.c 2006-1 1-29 16:10:15.000000000 -08002511 +++ vim70/src/buffer.c 2006-12-05 19:58:11.000000000 -0800 2512 2512 @@ -434,12 +434,8 @@ 2513 2513 if (usingNetbeans) … … 2660 2660 diff -Naur vim70.orig/src/configure vim70/src/configure 2661 2661 --- vim70.orig/src/configure 2006-05-07 07:17:49.000000000 -0700 2662 +++ vim70/src/configure 2006-1 1-29 16:09:55.000000000 -08002662 +++ vim70/src/configure 2006-12-05 19:57:51.000000000 -0800 2663 2663 @@ -2,5 +2,9 @@ 2664 2664 # run the automatically generated configure script … … 2673 2673 diff -Naur vim70.orig/src/configure.in vim70/src/configure.in 2674 2674 --- vim70.orig/src/configure.in 2006-05-04 03:46:11.000000000 -0700 2675 +++ vim70/src/configure.in 2006-1 1-29 16:10:11.000000000 -08002675 +++ vim70/src/configure.in 2006-12-05 19:58:07.000000000 -0800 2676 2676 @@ -508,7 +508,8 @@ 2677 2677 LDFLAGS=$ldflags_save … … 2716 2716 diff -Naur vim70.orig/src/edit.c vim70/src/edit.c 2717 2717 --- vim70.orig/src/edit.c 2006-05-07 04:48:51.000000000 -0700 2718 +++ vim70/src/edit.c 2006-1 1-29 16:10:14.000000000 -08002718 +++ vim70/src/edit.c 2006-12-05 19:58:11.000000000 -0800 2719 2719 @@ -129,7 +129,7 @@ 2720 2720 … … 3337 3337 diff -Naur vim70.orig/src/eval.c vim70/src/eval.c 3338 3338 --- vim70.orig/src/eval.c 2006-05-05 10:15:26.000000000 -0700 3339 +++ vim70/src/eval.c 2006-1 1-29 16:10:23.000000000 -08003339 +++ vim70/src/eval.c 2006-12-05 19:58:24.000000000 -0800 3340 3340 @@ -166,7 +166,6 @@ 3341 3341 int uf_tm_count; /* nr of calls */ … … 4039 4039 */ 4040 4040 static void 4041 @@ -16173,7 +16296,7 @@ 4041 @@ -15950,6 +16073,10 @@ 4042 } 4043 } 4044 4045 + /* add a terminating NUL */ 4046 + ga_grow(&ga, 1); 4047 + ga_append(&ga, NUL); 4048 + 4049 rettv->vval.v_string = ga.ga_data; 4050 } 4051 4052 @@ -16173,7 +16300,7 @@ 4042 4053 curwin->w_curswant = get_dict_number(dict, (char_u *)"curswant"); 4043 4054 curwin->w_set_curswant = FALSE; … … 4048 4059 curwin->w_topfill = get_dict_number(dict, (char_u *)"topfill"); 4049 4060 #endif 4050 @@ -16218,6 +1634 1,7 @@4061 @@ -16218,6 +16345,7 @@ 4051 4062 #ifdef FEAT_VIRTUALEDIT 4052 4063 dict_add_nr_str(dict, "coladd", (long)curwin->w_cursor.coladd, NULL); … … 4056 4067 4057 4068 dict_add_nr_str(dict, "topline", (long)curwin->w_topline, NULL); 4058 @@ -16438,9 +1656 2,12 @@4069 @@ -16438,9 +16566,12 @@ 4059 4070 long i = 0; 4060 4071 long n; … … 4072 4083 4073 4084 if (fnump != NULL) 4074 @@ -16466,8 +1659 3,9 @@4085 @@ -16466,8 +16597,9 @@ 4075 4086 #ifdef FEAT_VIRTUALEDIT 4076 4087 n = list_find_nr(l, i, NULL); … … 4084 4095 4085 4096 return OK; 4086 @@ -17759,6 +178 87,13 @@4097 @@ -17759,6 +17891,13 @@ 4087 4098 } 4088 4099 else /* add a new variable */ … … 4098 4109 for (p = varname; *p != NUL; ++p) 4099 4110 if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p)) 4100 @@ -17792,7 +179 27,7 @@4111 @@ -17792,7 +17931,7 @@ 4101 4112 } 4102 4113 … … 4107 4118 */ 4108 4119 static int 4109 @@ -17814,6 +179 49,23 @@4120 @@ -17814,6 +17953,23 @@ 4110 4121 } 4111 4122 … … 4131 4142 * Also give an error message, using "name". 4132 4143 */ 4133 @@ -18396,12 +185 48,14 @@4144 @@ -18396,12 +18552,14 @@ 4134 4145 4135 4146 if (!eap->skip) … … 4148 4159 if (*arg == K_SPECIAL) 4149 4160 j = 3; 4150 @@ -18786,6 +1894 0,7 @@4161 @@ -18786,6 +18944,7 @@ 4151 4162 if (dict_add(fudi.fd_dict, fudi.fd_di) == FAIL) 4152 4163 { … … 4156 4167 } 4157 4168 } 4158 @@ -18963,7 +191 18,8 @@4169 @@ -18963,7 +19122,8 @@ 4159 4170 else if (lead > 0) 4160 4171 { … … 4166 4177 /* It's "s:" or "<SID>" */ 4167 4178 if (current_SID <= 0) 4168 @@ -19618,6 +1977 4,7 @@4179 @@ -19618,6 +19778,7 @@ 4169 4180 char_u *name; 4170 4181 #ifdef FEAT_PROFILE … … 4174 4185 4175 4186 /* If depth of calling is getting too high, don't execute the function */ 4176 @@ -19685,6 +1984 2,7 @@4187 @@ -19685,6 +19846,7 @@ 4177 4188 v->di_tv.vval.v_list = &fc.l_varlist; 4178 4189 vim_memset(&fc.l_varlist, 0, sizeof(list_T)); … … 4182 4193 /* 4183 4194 * Set a:firstline to "firstline" and a:lastline to "lastline". 4184 @@ -19761,7 +199 19,7 @@4195 @@ -19761,7 +19923,7 @@ 4185 4196 if (p_verbose >= 14) 4186 4197 { … … 4191 4202 4192 4203 msg_puts((char_u *)"("); 4193 @@ -19773,8 +1993 1,8 @@4204 @@ -19773,8 +19935,8 @@ 4194 4205 msg_outnum((long)argvars[i].vval.v_number); 4195 4206 else … … 4202 4213 vim_free(tofree); 4203 4214 } 4204 @@ -19796,7 +1995 4,7 @@4215 @@ -19796,7 +19958,7 @@ 4205 4216 || (fc.caller != NULL && &fc.caller->func->uf_profiling)) 4206 4217 { … … 4211 4222 } 4212 4223 script_prof_save(&wait_start); 4213 @@ -19826,14 +1998 4,14 @@4224 @@ -19826,14 +19988,14 @@ 4214 4225 if (do_profiling == PROF_YES && (fp->uf_profiling 4215 4226 || (fc.caller != NULL && &fc.caller->func->uf_profiling))) … … 4232 4243 } 4233 4244 #endif 4234 @@ -19852,13 +2001 0,13 @@4245 @@ -19852,13 +20014,13 @@ 4235 4246 else 4236 4247 { … … 4250 4261 diff -Naur vim70.orig/src/ex_cmds2.c vim70/src/ex_cmds2.c 4251 4262 --- vim70.orig/src/ex_cmds2.c 2006-04-17 03:19:07.000000000 -0700 4252 +++ vim70/src/ex_cmds2.c 2006-1 1-29 16:09:58.000000000 -08004263 +++ vim70/src/ex_cmds2.c 2006-12-05 19:57:56.000000000 -0800 4253 4264 @@ -3648,13 +3648,13 @@ 4254 4265 * Return FALSE when not sourcing a file. … … 4271 4282 diff -Naur vim70.orig/src/ex_cmds.c vim70/src/ex_cmds.c 4272 4283 --- vim70.orig/src/ex_cmds.c 2006-04-22 11:56:56.000000000 -0700 4273 +++ vim70/src/ex_cmds.c 2006-1 1-29 16:10:04.000000000 -08004284 +++ vim70/src/ex_cmds.c 2006-12-05 19:58:00.000000000 -0800 4274 4285 @@ -95,7 +95,10 @@ 4275 4286 _("<%s>%s%s %d, Hex %02x, Octal %03o"), … … 4382 4393 diff -Naur vim70.orig/src/ex_cmds.h vim70/src/ex_cmds.h 4383 4394 --- vim70.orig/src/ex_cmds.h 2006-04-07 02:44:46.000000000 -0700 4384 +++ vim70/src/ex_cmds.h 2006-1 1-29 16:09:53.000000000 -08004395 +++ vim70/src/ex_cmds.h 2006-12-05 19:57:46.000000000 -0800 4385 4396 @@ -262,7 +262,7 @@ 4386 4397 EX(CMD_comclear, "comclear", ex_comclear, … … 4394 4405 diff -Naur vim70.orig/src/ex_docmd.c vim70/src/ex_docmd.c 4395 4406 --- vim70.orig/src/ex_docmd.c 2006-05-05 09:33:19.000000000 -0700 4396 +++ vim70/src/ex_docmd.c 2006-1 1-29 16:10:23.000000000 -08004407 +++ vim70/src/ex_docmd.c 2006-12-05 19:58:21.000000000 -0800 4397 4408 @@ -58,9 +58,9 @@ 4398 4409 #endif … … 4857 4868 diff -Naur vim70.orig/src/ex_eval.c vim70/src/ex_eval.c 4858 4869 --- vim70.orig/src/ex_eval.c 2006-04-22 12:22:27.000000000 -0700 4859 +++ vim70/src/ex_eval.c 2006-1 1-29 16:10:23.000000000 -08004870 +++ vim70/src/ex_eval.c 2006-12-05 19:58:21.000000000 -0800 4860 4871 @@ -340,7 +340,7 @@ 4861 4872 … … 4883 4894 diff -Naur vim70.orig/src/ex_getln.c vim70/src/ex_getln.c 4884 4895 --- vim70.orig/src/ex_getln.c 2006-04-30 08:32:01.000000000 -0700 4885 +++ vim70/src/ex_getln.c 2006-1 1-29 16:10:15.000000000 -08004896 +++ vim70/src/ex_getln.c 2006-12-05 19:58:12.000000000 -0800 4886 4897 @@ -34,7 +34,7 @@ 4887 4898 int xp_context; /* type of expansion */ … … 5033 5044 diff -Naur vim70.orig/src/fileio.c vim70/src/fileio.c 5034 5045 --- vim70.orig/src/fileio.c 2006-04-30 08:28:57.000000000 -0700 5035 +++ vim70/src/fileio.c 2006-1 1-29 16:10:06.000000000 -08005046 +++ vim70/src/fileio.c 2006-12-05 19:58:02.000000000 -0800 5036 5047 @@ -316,6 +316,9 @@ 5037 5048 * display the line. */ … … 5155 5166 diff -Naur vim70.orig/src/fold.c vim70/src/fold.c 5156 5167 --- vim70.orig/src/fold.c 2006-04-22 12:35:56.000000000 -0700 5157 +++ vim70/src/fold.c 2006-1 1-29 16:10:14.000000000 -08005168 +++ vim70/src/fold.c 2006-12-05 19:58:10.000000000 -0800 5158 5169 @@ -2971,7 +2971,11 @@ 5159 5170 else … … 5170 5181 diff -Naur vim70.orig/src/getchar.c vim70/src/getchar.c 5171 5182 --- vim70.orig/src/getchar.c 2006-05-03 10:29:21.000000000 -0700 5172 +++ vim70/src/getchar.c 2006-11-29 16:10:08.000000000 -0800 5173 @@ -1451,7 +1451,8 @@ 5183 +++ vim70/src/getchar.c 2006-12-05 19:58:33.000000000 -0800 5184 @@ -76,7 +76,7 @@ 5185 */ 5186 static mapblock_T *first_abbr = NULL; /* first entry in abbrlist */ 5187 5188 -static int KeyNoremap = FALSE; /* remapping disabled */ 5189 +static int KeyNoremap = 0; /* remapping flags */ 5190 5191 /* 5192 * variables used by vgetorpeek() and flush_buffers() 5193 @@ -1035,6 +1035,8 @@ 5194 /* 5195 * Put character "c" back into the typeahead buffer. 5196 * Can be used for a character obtained by vgetc() that needs to be put back. 5197 + * Uses cmd_silent, KeyTyped and KeyNoremap to restore the flags belonging to 5198 + * the char. 5199 */ 5200 void 5201 ins_char_typebuf(c) 5202 @@ -1061,7 +1063,7 @@ 5203 buf[1] = NUL; 5204 #endif 5205 } 5206 - (void)ins_typebuf(buf, REMAP_YES, 0, !KeyTyped, FALSE); 5207 + (void)ins_typebuf(buf, KeyNoremap, 0, !KeyTyped, cmd_silent); 5208 } 5209 5210 /* 5211 @@ -1451,7 +1453,8 @@ 5174 5212 { 5175 5213 updatescript(0); … … 5181 5219 } 5182 5220 5183 @@ -1502,6 +150 3,13 @@5221 @@ -1502,6 +1505,13 @@ 5184 5222 int i; 5185 5223 #endif … … 5195 5233 * If a character was put back with vungetc, it was already processed. 5196 5234 * Return it directly. 5197 @@ -1511,13 +15 19,13 @@5235 @@ -1511,13 +1521,13 @@ 5198 5236 c = old_char; 5199 5237 old_char = -1; … … 5214 5252 { 5215 5253 ++no_mapping; 5216 @@ -1695,8 +170 3,20 @@5254 @@ -1695,8 +1705,20 @@ 5217 5255 } 5218 5256 #endif … … 5236 5274 5237 5275 /* 5238 @@ -1940,10 +196 0,13 @@5276 @@ -1940,10 +1962,13 @@ 5239 5277 c = Ctrl_C; 5240 5278 flush_buffers(TRUE); /* flush all typeahead */ … … 5254 5292 5255 5293 break; 5294 @@ -2247,9 +2272,8 @@ 5295 gotchars(typebuf.tb_buf 5296 + typebuf.tb_off, 1); 5297 } 5298 - KeyNoremap = (typebuf.tb_noremap[ 5299 - typebuf.tb_off] 5300 - & (RM_NONE|RM_SCRIPT)); 5301 + KeyNoremap = typebuf.tb_noremap[ 5302 + typebuf.tb_off]; 5303 del_typebuf(1, 0); 5304 } 5305 break; /* got character, break for loop */ 5306 @@ -4173,7 +4197,8 @@ 5307 5308 if (typebuf.tb_no_abbr_cnt) /* abbrev. are not recursive */ 5309 return FALSE; 5310 - if (KeyNoremap) /* no remapping implies no abbreviation */ 5311 + if ((KeyNoremap & (RM_NONE|RM_SCRIPT)) != 0) 5312 + /* no remapping implies no abbreviation */ 5313 return FALSE; 5314 5315 /* 5256 5316 diff -Naur vim70.orig/src/globals.h vim70/src/globals.h 5257 5317 --- vim70.orig/src/globals.h 2006-04-30 06:16:23.000000000 -0700 5258 +++ vim70/src/globals.h 2006-1 1-29 16:10:10.000000000 -08005318 +++ vim70/src/globals.h 2006-12-05 19:58:06.000000000 -0800 5259 5319 @@ -166,6 +166,7 @@ 5260 5320 EXTERN int emsg_off INIT(= 0); /* don't display errors for now, … … 5296 5356 diff -Naur vim70.orig/src/gui_at_fs.c vim70/src/gui_at_fs.c 5297 5357 --- vim70.orig/src/gui_at_fs.c 2005-07-09 04:30:17.000000000 -0700 5298 +++ vim70/src/gui_at_fs.c 2006-1 1-29 16:09:50.000000000 -08005358 +++ vim70/src/gui_at_fs.c 2006-12-05 19:57:43.000000000 -0800 5299 5359 @@ -1861,27 +1861,27 @@ 5300 5360 XtPointer pnew; … … 5412 5472 diff -Naur vim70.orig/src/gui_beval.c vim70/src/gui_beval.c 5413 5473 --- vim70.orig/src/gui_beval.c 2006-05-04 12:29:51.000000000 -0700 5414 +++ vim70/src/gui_beval.c 2006-1 1-29 16:09:58.000000000 -08005474 +++ vim70/src/gui_beval.c 2006-12-05 19:57:56.000000000 -0800 5415 5475 @@ -926,7 +926,7 @@ 5416 5476 # define IS_NONPRINTABLE(c) (((c) < 0x20 && (c) != TAB && (c) != NL) \ … … 5451 5511 diff -Naur vim70.orig/src/gui.c vim70/src/gui.c 5452 5512 --- vim70.orig/src/gui.c 2006-05-03 04:00:59.000000000 -0700 5453 +++ vim70/src/gui.c 2006-1 1-29 16:10:10.000000000 -08005513 +++ vim70/src/gui.c 2006-12-05 19:58:06.000000000 -0800 5454 5514 @@ -187,9 +187,10 @@ 5455 5515 #endif … … 5554 5614 diff -Naur vim70.orig/src/gui_gtk.c vim70/src/gui_gtk.c 5555 5615 --- vim70.orig/src/gui_gtk.c 2006-05-05 04:52:52.000000000 -0700 5556 +++ vim70/src/gui_gtk.c 2006-1 1-29 16:10:13.000000000 -08005616 +++ vim70/src/gui_gtk.c 2006-12-05 19:58:10.000000000 -0800 5557 5617 @@ -957,15 +957,15 @@ 5558 5618 get_menu_position(vimmenu_T *menu) … … 5652 5712 diff -Naur vim70.orig/src/gui_gtk_x11.c vim70/src/gui_gtk_x11.c 5653 5713 --- vim70.orig/src/gui_gtk_x11.c 2006-05-04 23:58:59.000000000 -0700 5654 +++ vim70/src/gui_gtk_x11.c 2006-1 1-29 16:09:58.000000000 -08005714 +++ vim70/src/gui_gtk_x11.c 2006-12-05 19:57:56.000000000 -0800 5655 5715 @@ -3233,12 +3233,12 @@ 5656 5716 on_select_tab( … … 5717 5777 diff -Naur vim70.orig/src/gui_xmebw.c vim70/src/gui_xmebw.c 5718 5778 --- vim70.orig/src/gui_xmebw.c 2006-04-30 08:32:32.000000000 -0700 5719 +++ vim70/src/gui_xmebw.c 2006-1 1-29 16:10:13.000000000 -08005779 +++ vim70/src/gui_xmebw.c 2006-12-05 19:58:10.000000000 -0800 5720 5780 @@ -47,13 +47,13 @@ 5721 5781 #include "gui_xmebwp.h" … … 5846 5906 diff -Naur vim70.orig/src/hardcopy.c vim70/src/hardcopy.c 5847 5907 --- vim70.orig/src/hardcopy.c 2006-05-04 03:09:58.000000000 -0700 5848 +++ vim70/src/hardcopy.c 2006-1 1-29 16:09:58.000000000 -08005908 +++ vim70/src/hardcopy.c 2006-12-05 19:57:56.000000000 -0800 5849 5909 @@ -1794,29 +1794,27 @@ 5850 5910 static int … … 5949 6009 diff -Naur vim70.orig/src/if_cscope.c vim70/src/if_cscope.c 5950 6010 --- vim70.orig/src/if_cscope.c 2006-04-18 01:54:15.000000000 -0700 5951 +++ vim70/src/if_cscope.c 2006-1 1-29 16:10:15.000000000 -08006011 +++ vim70/src/if_cscope.c 2006-12-05 19:58:12.000000000 -0800 5952 6012 @@ -989,8 +989,7 @@ 5953 6013 { … … 6066 6126 diff -Naur vim70.orig/src/if_perl.xs vim70/src/if_perl.xs 6067 6127 --- vim70.orig/src/if_perl.xs 2006-03-06 10:57:16.000000000 -0800 6068 +++ vim70/src/if_perl.xs 2006-1 1-29 16:09:56.000000000 -08006128 +++ vim70/src/if_perl.xs 2006-12-05 19:57:54.000000000 -0800 6069 6129 @@ -155,8 +155,8 @@ 6070 6130 static int (*perl_run)(PerlInterpreter*); … … 6181 6241 diff -Naur vim70.orig/src/if_python.c vim70/src/if_python.c 6182 6242 --- vim70.orig/src/if_python.c 2006-04-30 08:31:36.000000000 -0700 6183 +++ vim70/src/if_python.c 2006-1 1-29 16:10:08.000000000 -08006243 +++ vim70/src/if_python.c 2006-12-05 19:58:04.000000000 -0800 6184 6244 @@ -1463,7 +1463,7 @@ 6185 6245 if (this->buf && this->buf != INVALID_BUFFER_VALUE) … … 6220 6280 diff -Naur vim70.orig/src/if_ruby.c vim70/src/if_ruby.c 6221 6281 --- vim70.orig/src/if_ruby.c 2006-04-30 08:37:52.000000000 -0700 6222 +++ vim70/src/if_ruby.c 2006-1 1-29 16:09:56.000000000 -08006282 +++ vim70/src/if_ruby.c 2006-12-05 19:57:54.000000000 -0800 6223 6283 @@ -643,11 +643,14 @@ 6224 6284 … … 6335 6395 diff -Naur vim70.orig/src/macros.h vim70/src/macros.h 6336 6396 --- vim70.orig/src/macros.h 2006-03-01 04:01:10.000000000 -0800 6337 +++ vim70/src/macros.h 2006-1 1-29 16:10:04.000000000 -08006397 +++ vim70/src/macros.h 2006-12-05 19:58:00.000000000 -0800 6338 6398 @@ -276,3 +276,9 @@ 6339 6399 # define MB_CHARLEN(p) STRLEN(p) … … 6348 6408 diff -Naur vim70.orig/src/main.c vim70/src/main.c 6349 6409 --- vim70.orig/src/main.c 2006-05-03 10:36:44.000000000 -0700 6350 +++ vim70/src/main.c 2006-1 1-29 16:10:15.000000000 -08006410 +++ vim70/src/main.c 2006-12-05 19:58:11.000000000 -0800 6351 6411 @@ -564,7 +564,11 @@ 6352 6412 */ … … 6542 6602 diff -Naur vim70.orig/src/Makefile vim70/src/Makefile 6543 6603 --- vim70.orig/src/Makefile 2006-05-07 06:25:27.000000000 -0700 6544 +++ vim70/src/Makefile 2006-1 1-29 16:10:01.000000000 -08006604 +++ vim70/src/Makefile 2006-12-05 19:57:59.000000000 -0800 6545 6605 @@ -2177,6 +2177,7 @@ 6546 6606 cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* . … … 6562 6622 diff -Naur vim70.orig/src/mbyte.c vim70/src/mbyte.c 6563 6623 --- vim70.orig/src/mbyte.c 2006-04-30 04:51:01.000000000 -0700 6564 +++ vim70/src/mbyte.c 2006-1 1-29 16:09:58.000000000 -08006624 +++ vim70/src/mbyte.c 2006-12-05 19:58:39.000000000 -0800 6565 6625 @@ -311,7 +311,11 @@ 6566 6626 … … 6593 6653 }; 6594 6654 6595 @@ -3507,6 +3514,11 @@ 6655 @@ -2287,8 +2294,14 @@ 6656 } 6657 /* Check directly first, it's faster. */ 6658 for (j = 0; j < l; ++j) 6659 + { 6660 if (s1[i + j] != s2[i + j]) 6661 break; 6662 + if (s1[i + j] == 0) 6663 + /* Both stings have the same bytes but are incomplete or 6664 + * have illegal bytes, accept them as equal. */ 6665 + l = j; 6666 + } 6667 if (j < l) 6668 { 6669 /* If one of the two characters is incomplete return -1. */ 6670 @@ -3507,6 +3520,11 @@ 6596 6671 add_to_input_buf(delkey, (int)sizeof(delkey)); 6597 6672 } … … 6605 6680 im_correct_cursor(int num_move_back) 6606 6681 { 6607 @@ -3734,8 +37 46,7 @@6682 @@ -3734,8 +3752,7 @@ 6608 6683 } 6609 6684 else if (cursor_index == 0 && preedit_string[0] == '\0') … … 6615 6690 /* If at the start position (after typing backspace) 6616 6691 * preedit_start_col must be reset. */ 6617 @@ -3850,13 +386 1,13 @@6692 @@ -3850,13 +3867,13 @@ 6618 6693 6619 6694 if (preedit_string != NULL && attr_list != NULL) … … 6633 6708 PangoAttrIterator *iter; 6634 6709 int start, end; 6635 @@ -3869,7 +388 0,7 @@6710 @@ -3869,7 +3886,7 @@ 6636 6711 { 6637 6712 pango_attr_iterator_range(iter, &start, &end); … … 6644 6719 diff -Naur vim70.orig/src/memfile.c vim70/src/memfile.c 6645 6720 --- vim70.orig/src/memfile.c 2006-03-06 00:59:15.000000000 -0800 6646 +++ vim70/src/memfile.c 2006-1 1-29 16:10:14.000000000 -08006721 +++ vim70/src/memfile.c 2006-12-05 19:58:11.000000000 -0800 6647 6722 @@ -517,7 +517,7 @@ 6648 6723 mf_ins_free(mfp, hp); /* put *hp in the free list */ … … 6701 6776 diff -Naur vim70.orig/src/memline.c vim70/src/memline.c 6702 6777 --- vim70.orig/src/memline.c 2006-04-20 14:00:21.000000000 -0700 6703 +++ vim70/src/memline.c 2006-1 1-29 16:10:15.000000000 -08006778 +++ vim70/src/memline.c 2006-12-05 19:58:12.000000000 -0800 6704 6779 @@ -215,7 +215,7 @@ 6705 6780 #define ML_FLUSH 0x02 /* flush locked block */ … … 6785 6860 diff -Naur vim70.orig/src/menu.c vim70/src/menu.c 6786 6861 --- vim70.orig/src/menu.c 2006-05-03 10:30:48.000000000 -0700 6787 +++ vim70/src/menu.c 2006-1 1-29 16:09:56.000000000 -08006862 +++ vim70/src/menu.c 2006-12-05 19:58:28.000000000 -0800 6788 6863 @@ -511,6 +511,14 @@ 6789 6864 * name (without mnemonic and accelerator text). */ … … 6860 6935 * defined. This is done once here. add_menu_path() may have already been 6861 6936 * called to define these menus, and may be called again. This function calls 6937 @@ -2200,7 +2246,7 @@ 6938 { 6939 /* When executing a script or function execute the commands right now. 6940 * Otherwise put them in the typeahead buffer. */ 6941 -#ifdef FEAT_En 6942 +#ifdef FEAT_EVAL 6943 if (current_SID != 0) 6944 exec_normal_cmd(menu->strings[idx], menu->noremap[idx], 6945 menu->silent[idx]); 6862 6946 diff -Naur vim70.orig/src/message.c vim70/src/message.c 6863 6947 --- vim70.orig/src/message.c 2006-05-06 13:07:37.000000000 -0700 6864 +++ vim70/src/message.c 2006-1 1-29 16:10:10.000000000 -08006948 +++ vim70/src/message.c 2006-12-05 19:58:06.000000000 -0800 6865 6949 @@ -53,7 +53,6 @@ 6866 6950 static struct msg_hist *first_msg_hist = NULL; … … 6915 6999 diff -Naur vim70.orig/src/misc1.c vim70/src/misc1.c 6916 7000 --- vim70.orig/src/misc1.c 2006-04-30 08:30:02.000000000 -0700 6917 +++ vim70/src/misc1.c 2006-1 1-29 16:10:13.000000000 -08007001 +++ vim70/src/misc1.c 2006-12-05 19:58:10.000000000 -0800 6918 7002 @@ -1761,15 +1761,13 @@ 6919 7003 * Add column offset for 'number', 'foldcolumn', etc. … … 7030 7114 diff -Naur vim70.orig/src/misc2.c vim70/src/misc2.c 7031 7115 --- vim70.orig/src/misc2.c 2006-05-04 05:12:38.000000000 -0700 7032 +++ vim70/src/misc2.c 2006-1 1-29 16:10:08.000000000 -08007116 +++ vim70/src/misc2.c 2006-12-05 19:58:04.000000000 -0800 7033 7117 @@ -1229,6 +1229,94 @@ 7034 7118 return escaped_string; … … 7128 7212 diff -Naur vim70.orig/src/netbeans.c vim70/src/netbeans.c 7129 7213 --- vim70.orig/src/netbeans.c 2006-04-22 11:00:05.000000000 -0700 7130 +++ vim70/src/netbeans.c 2006-1 1-29 16:10:15.000000000 -08007214 +++ vim70/src/netbeans.c 2006-12-05 19:58:11.000000000 -0800 7131 7215 @@ -61,7 +61,7 @@ 7132 7216 … … 7337 7421 diff -Naur vim70.orig/src/normal.c vim70/src/normal.c 7338 7422 --- vim70.orig/src/normal.c 2006-04-29 06:11:18.000000000 -0700 7339 +++ vim70/src/normal.c 2006-11-29 16:10:15.000000000 -0800 7340 @@ -1477,14 +1477,17 @@ 7423 +++ vim70/src/normal.c 2006-12-05 19:58:33.000000000 -0800 7424 @@ -651,9 +651,8 @@ 7425 /* Fake a "c"hange command. When "restart_edit" is set (e.g., because 7426 * 'insertmode' is set) fake a "d"elete command, Insert mode will 7427 * restart automatically. 7428 - * Insert the typed character in the typeahead buffer, so that it will 7429 - * be mapped in Insert mode. Required for ":lmap" to work. May cause 7430 - * mapping a character from ":vnoremap"... */ 7431 + * Insert the typed character in the typeahead buffer, so that it can 7432 + * be mapped in Insert mode. Required for ":lmap" to work. */ 7433 ins_char_typebuf(c); 7434 if (restart_edit != 0) 7435 c = 'd'; 7436 @@ -1477,14 +1476,17 @@ 7341 7437 } 7342 7438 else if (VIsual_active) … … 7362 7458 /* In Select mode, a linewise selection is operated upon like a 7363 7459 * characterwise selection. */ 7364 @@ -2377,11 +23 80,20 @@7460 @@ -2377,11 +2379,20 @@ 7365 7461 /* 7366 7462 * If visual was active, yank the highlighted text and put it … … 7385 7481 return FALSE; 7386 7482 } 7387 @@ -2504,7 +251 6,8 @@7483 @@ -2504,7 +2515,8 @@ 7388 7484 * NOTE: Ignore right button down and drag mouse events. 7389 7485 * Windows only shows the popup menu on the button up event. … … 7395 7491 return FALSE; 7396 7492 #endif 7397 @@ -4126,7 +413 9,7 @@7493 @@ -4126,7 +4138,7 @@ 7398 7494 int save_p_ws; 7399 7495 int save_p_scs; … … 7404 7500 if ((pat = alloc(len + 7)) == NULL) 7405 7501 return FAIL; 7406 @@ -4146,7 +415 9,7 @@7502 @@ -4146,7 +4158,7 @@ 7407 7503 * With "gd" Search back for the start of the current function, then go 7408 7504 * back until a blank line. If this fails go to line 1. … … 7413 7509 setpcmark(); /* Set in findpar() otherwise */ 7414 7510 curwin->w_cursor.lnum = 1; 7415 @@ -8847,7 +88 60,7 @@7511 @@ -8847,7 +8859,7 @@ 7416 7512 #endif 7417 7513 while (cap->count1-- && !got_int) … … 7424 7520 diff -Naur vim70.orig/src/ops.c vim70/src/ops.c 7425 7521 --- vim70.orig/src/ops.c 2006-04-30 08:13:44.000000000 -0700 7426 +++ vim70/src/ops.c 2006-1 1-29 16:10:15.000000000 -08007522 +++ vim70/src/ops.c 2006-12-05 19:58:11.000000000 -0800 7427 7523 @@ -95,8 +95,8 @@ 7428 7524 static void block_insert __ARGS((oparg_T *oap, char_u *s, int b_insert, struct block_def*bdp)); … … 7624 7720 diff -Naur vim70.orig/src/option.c vim70/src/option.c 7625 7721 --- vim70.orig/src/option.c 2006-05-03 10:32:28.000000000 -0700 7626 +++ vim70/src/option.c 2006-1 1-29 16:10:11.000000000 -08007722 +++ vim70/src/option.c 2006-12-05 19:58:09.000000000 -0800 7627 7723 @@ -2294,7 +2294,7 @@ 7628 7724 {(char_u *)0L, (char_u *)0L} … … 7740 7836 diff -Naur vim70.orig/src/os_unix.c vim70/src/os_unix.c 7741 7837 --- vim70.orig/src/os_unix.c 2006-05-01 01:13:15.000000000 -0700 7742 +++ vim70/src/os_unix.c 2006-1 1-29 16:09:58.000000000 -08007838 +++ vim70/src/os_unix.c 2006-12-05 19:57:56.000000000 -0800 7743 7839 @@ -3934,7 +3934,7 @@ 7744 7840 { … … 7799 7895 diff -Naur vim70.orig/src/popupmnu.c vim70/src/popupmnu.c 7800 7896 --- vim70.orig/src/popupmnu.c 2006-04-20 13:18:37.000000000 -0700 7801 +++ vim70/src/popupmnu.c 2006-1 1-29 16:09:57.000000000 -08007897 +++ vim70/src/popupmnu.c 2006-12-05 19:57:54.000000000 -0800 7802 7898 @@ -552,6 +552,9 @@ 7803 7899 { … … 7812 7908 diff -Naur vim70.orig/src/proto/buffer.pro vim70/src/proto/buffer.pro 7813 7909 --- vim70.orig/src/proto/buffer.pro 2006-05-07 06:08:29.000000000 -0700 7814 +++ vim70/src/proto/buffer.pro 2006-1 1-29 16:10:04.000000000 -08007910 +++ vim70/src/proto/buffer.pro 2006-12-05 19:58:00.000000000 -0800 7815 7911 @@ -10,6 +10,7 @@ 7816 7912 extern int do_buffer __ARGS((int action, int start, int dir, int count, int forceit)); … … 7823 7919 diff -Naur vim70.orig/src/proto/eval.pro vim70/src/proto/eval.pro 7824 7920 --- vim70.orig/src/proto/eval.pro 2006-05-07 06:08:33.000000000 -0700 7825 +++ vim70/src/proto/eval.pro 2006-1 1-29 16:10:10.000000000 -08007921 +++ vim70/src/proto/eval.pro 2006-12-05 19:58:07.000000000 -0800 7826 7922 @@ -44,7 +44,7 @@ 7827 7923 extern char_u *get_user_var_name __ARGS((expand_T *xp, int idx)); … … 7835 7931 diff -Naur vim70.orig/src/proto/menu.pro vim70/src/proto/menu.pro 7836 7932 --- vim70.orig/src/proto/menu.pro 2006-05-07 06:08:51.000000000 -0700 7837 +++ vim70/src/proto/menu.pro 2006-1 1-29 16:09:56.000000000 -08007933 +++ vim70/src/proto/menu.pro 2006-12-05 19:57:54.000000000 -0800 7838 7934 @@ -10,6 +10,7 @@ 7839 7935 extern int menu_is_child_of_popup __ARGS((vimmenu_T *menu)); … … 7846 7942 diff -Naur vim70.orig/src/proto/misc2.pro vim70/src/proto/misc2.pro 7847 7943 --- vim70.orig/src/proto/misc2.pro 2006-05-07 06:08:54.000000000 -0700 7848 +++ vim70/src/proto/misc2.pro 2006-1 1-29 16:10:08.000000000 -08007944 +++ vim70/src/proto/misc2.pro 2006-12-05 19:58:04.000000000 -0800 7849 7945 @@ -29,6 +29,7 @@ 7850 7946 extern char_u *vim_strnsave __ARGS((char_u *string, int len)); … … 7857 7953 diff -Naur vim70.orig/src/proto/ops.pro vim70/src/proto/ops.pro 7858 7954 --- vim70.orig/src/proto/ops.pro 2006-05-07 06:08:58.000000000 -0700 7859 +++ vim70/src/proto/ops.pro 2006-1 1-29 16:10:15.000000000 -08007955 +++ vim70/src/proto/ops.pro 2006-12-05 19:58:11.000000000 -0800 7860 7956 @@ -17,10 +17,10 @@ 7861 7957 extern void put_register __ARGS((int name, void *reg)); … … 7873 7969 diff -Naur vim70.orig/src/proto/undo.pro vim70/src/proto/undo.pro 7874 7970 --- vim70.orig/src/proto/undo.pro 2006-05-07 06:09:11.000000000 -0700 7875 +++ vim70/src/proto/undo.pro 2006-1 1-29 16:09:53.000000000 -08007971 +++ vim70/src/proto/undo.pro 2006-12-05 19:57:47.000000000 -0800 7876 7972 @@ -4,6 +4,7 @@ 7877 7973 extern int u_savesub __ARGS((linenr_T lnum)); … … 7884 7980 diff -Naur vim70.orig/src/quickfix.c vim70/src/quickfix.c 7885 7981 --- vim70.orig/src/quickfix.c 2006-05-03 00:47:42.000000000 -0700 7886 +++ vim70/src/quickfix.c 2006-1 1-29 16:10:12.000000000 -08007982 +++ vim70/src/quickfix.c 2006-12-05 19:58:09.000000000 -0800 7887 7983 @@ -500,8 +500,6 @@ 7888 7984 { … … 8139 8235 diff -Naur vim70.orig/src/regexp.c vim70/src/regexp.c 8140 8236 --- vim70.orig/src/regexp.c 2006-04-30 08:31:50.000000000 -0700 8141 +++ vim70/src/regexp.c 2006-1 1-29 16:10:12.000000000 -08008237 +++ vim70/src/regexp.c 2006-12-05 19:58:09.000000000 -0800 8142 8238 @@ -3777,8 +3777,8 @@ 8143 8239 … … 8276 8372 diff -Naur vim70.orig/src/screen.c vim70/src/screen.c 8277 8373 --- vim70.orig/src/screen.c 2006-05-05 03:13:55.000000000 -0700 8278 +++ vim70/src/screen.c 2006-1 1-29 16:10:15.000000000 -08008374 +++ vim70/src/screen.c 2006-12-05 19:58:12.000000000 -0800 8279 8375 @@ -455,6 +455,7 @@ 8280 8376 && curwin->w_topline == curwin->w_lines[0].wl_lnum) … … 8460 8556 diff -Naur vim70.orig/src/search.c vim70/src/search.c 8461 8557 --- vim70.orig/src/search.c 2006-05-05 05:12:13.000000000 -0700 8462 +++ vim70/src/search.c 2006-1 1-29 16:10:10.000000000 -08008558 +++ vim70/src/search.c 2006-12-05 19:58:06.000000000 -0800 8463 8559 @@ -1259,7 +1259,7 @@ 8464 8560 /* … … 8517 8613 diff -Naur vim70.orig/src/spell.c vim70/src/spell.c 8518 8614 --- vim70.orig/src/spell.c 2006-05-05 00:49:58.000000000 -0700 8519 +++ vim70/src/spell.c 2006-1 1-29 16:10:06.000000000 -08008615 +++ vim70/src/spell.c 2006-12-05 19:58:02.000000000 -0800 8520 8616 @@ -1483,7 +1483,7 @@ 8521 8617 else if ((mode == FIND_COMPOUND || mode == FIND_KEEPCOMPOUND … … 8848 8944 diff -Naur vim70.orig/src/structs.h vim70/src/structs.h 8849 8945 --- vim70.orig/src/structs.h 2006-04-09 10:57:46.000000000 -0700 8850 +++ vim70/src/structs.h 2006-1 1-29 16:09:56.000000000 -08008946 +++ vim70/src/structs.h 2006-12-05 19:57:54.000000000 -0800 8851 8947 @@ -2213,18 +2213,20 @@ 8852 8948 … … 8874 8970 diff -Naur vim70.orig/src/syntax.c vim70/src/syntax.c 8875 8971 --- vim70.orig/src/syntax.c 2006-04-26 05:49:45.000000000 -0700 8876 +++ vim70/src/syntax.c 2006-1 1-29 16:10:14.000000000 -08008972 +++ vim70/src/syntax.c 2006-12-05 19:58:10.000000000 -0800 8877 8973 @@ -977,6 +977,7 @@ 8878 8974 { … … 8978 9074 diff -Naur vim70.orig/src/tag.c vim70/src/tag.c 8979 9075 --- vim70.orig/src/tag.c 2006-04-27 06:11:21.000000000 -0700 8980 +++ vim70/src/tag.c 2006-1 1-29 16:10:10.000000000 -08009076 +++ vim70/src/tag.c 2006-12-05 19:58:07.000000000 -0800 8981 9077 @@ -911,7 +911,7 @@ 8982 9078 … … 9020 9116 diff -Naur vim70.orig/src/term.c vim70/src/term.c 9021 9117 --- vim70.orig/src/term.c 2006-05-03 10:34:57.000000000 -0700 9022 +++ vim70/src/term.c 2006-1 1-29 16:10:13.000000000 -08009118 +++ vim70/src/term.c 2006-12-05 19:58:10.000000000 -0800 9023 9119 @@ -3137,25 +3137,32 @@ 9024 9120 screenalloc(FALSE); … … 9084 9180 diff -Naur vim70.orig/src/testdir/test56.in vim70/src/testdir/test56.in 9085 9181 --- vim70.orig/src/testdir/test56.in 2005-05-18 08:37:37.000000000 -0700 9086 +++ vim70/src/testdir/test56.in 2006-1 1-29 16:10:03.000000000 -08009182 +++ vim70/src/testdir/test56.in 2006-12-05 19:58:00.000000000 -0800 9087 9183 @@ -3,7 +3,7 @@ 9088 9184 STARTTEST … … 9096 9192 diff -Naur vim70.orig/src/ui.c vim70/src/ui.c 9097 9193 --- vim70.orig/src/ui.c 2006-03-27 11:15:09.000000000 -0800 9098 +++ vim70/src/ui.c 2006-1 1-29 16:09:59.000000000 -08009194 +++ vim70/src/ui.c 2006-12-05 19:57:56.000000000 -0800 9099 9195 @@ -1137,7 +1137,6 @@ 9100 9196 int len; … … 9116 9212 diff -Naur vim70.orig/src/undo.c vim70/src/undo.c 9117 9213 --- vim70.orig/src/undo.c 2006-04-21 02:30:59.000000000 -0700 9118 +++ vim70/src/undo.c 2006-1 1-29 16:09:59.000000000 -08009214 +++ vim70/src/undo.c 2006-12-05 19:57:56.000000000 -0800 9119 9215 @@ -84,7 +84,6 @@ 9120 9216 static void u_unch_branch __ARGS((u_header_T *uhp)); … … 9181 9277 diff -Naur vim70.orig/src/version.c vim70/src/version.c 9182 9278 --- vim70.orig/src/version.c 2006-05-03 00:50:42.000000000 -0700 9183 +++ vim70/src/version.c 2006-1 1-29 16:10:24.000000000 -08009184 @@ -667,6 +667,32 0@@9279 +++ vim70/src/version.c 2006-12-05 19:58:39.000000000 -0800 9280 @@ -667,6 +667,328 @@ 9185 9281 static int included_patches[] = 9186 9282 { /* Add new patch number below this line */ 9187 9283 /**/ 9284 + 178, 9285 +/**/ 9286 + 177, 9287 +/**/ 9288 + 176, 9289 +/**/ 9290 + 175, 9291 +/**/ 9188 9292 + 174, 9189 9293 +/**/ … … 9503 9607 }; 9504 9608 9505 @@ -731,7 +10 45,11 @@9609 @@ -731,7 +1053,11 @@ 9506 9610 /* Only MS VC 4.1 and earlier can do Win32s */ 9507 9611 MSG_PUTS(_("\nMS-Windows 16/32 bit GUI version")); … … 9517 9621 diff -Naur vim70.orig/src/vim.h vim70/src/vim.h 9518 9622 --- vim70.orig/src/vim.h 2006-04-30 08:32:38.000000000 -0700 9519 +++ vim70/src/vim.h 2006-1 1-29 16:10:14.000000000 -08009623 +++ vim70/src/vim.h 2006-12-05 19:58:11.000000000 -0800 9520 9624 @@ -585,7 +585,6 @@ 9521 9625 #define INSERT 0x10 /* Insert mode */ … … 9558 9662 diff -Naur vim70.orig/src/window.c vim70/src/window.c 9559 9663 --- vim70.orig/src/window.c 2006-05-06 03:54:51.000000000 -0700 9560 +++ vim70/src/window.c 2006-1 1-29 16:10:15.000000000 -08009664 +++ vim70/src/window.c 2006-12-05 19:58:12.000000000 -0800 9561 9665 @@ -340,10 +340,10 @@ 9562 9666 {
Note:
See TracChangeset
for help on using the changeset viewer.