thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.0097

Browse Source
This commit is contained in:
Bram Moolenaar
2005-06-29 22:40:58 +00:00
parent 24bbcfe8fe
commit 42eeac3552
123 changed files with 6496 additions and 3288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/fileio.c
View File

@@ -1344,8 +1344,11 @@ retry:
== (size_t)-1 && ICONV_ERRNO != ICONV_EINVAL)
|| from_size > CONV_RESTLEN)
{
if (!keep_dest_enc)
if (!keep_dest_enc && can_retry)
goto rewind_retry;
if (!keep_dest_enc)
conv_error = TRUE;
/* Ignore a byte and try again. */
++fromp;
--from_size;
@@ -1761,6 +1764,7 @@ rewind_retry:
conv_error = TRUE;
else
# endif
if (illegal_byte == 0) /* Keep the first linenr */
{
char_u *s;

5
src/misc1.c
View File

@@ -3162,7 +3162,10 @@ prompt_for_number(mouse_used)
int save_State;
/* When using ":silent" assume that <CR> was entered. */
MSG_PUTS(_("Choice number (<Enter> cancels): "));
if (mouse_used != NULL)
MSG_PUTS(_("Type number or click with mouse (<Enter> cancels): "));
else
MSG_PUTS(_("Choice number (<Enter> cancels): "));
/* Set the state such that text can be selected/copied/pasted. */
save_cmdline_row = cmdline_row;

796
src/spell.c
View File

File diff suppressed because it is too large Load Diff

68
src/spell/he_IL.diff
View File

@@ -1,5 +1,5 @@
*** he_IL.orig.aff Sat Jun 18 14:46:51 2005
--- he_IL.aff Sat Jun 18 15:13:34 2005
--- he_IL.aff Wed Jun 29 17:24:12 2005
***************
*** 2,3 ****
--- 2,6 ----
@@ -8,3 +8,69 @@
+ PFXPOSTPONE
+
# This file was generated automatically from data prepared
*** he_IL.orig.dic Sat Jun 18 14:47:00 2005
--- he_IL.dic Wed Jun 29 17:22:13 2005
***************
*** 318898,318902 ****
<20><>
- <20><>
<20><>
- <20><><EFBFBD>
<20><>
--- 318898,318900 ----
***************
*** 318911,318913 ****
<20><><EFBFBD><EFBFBD><EFBFBD>
- <20><><EFBFBD>
<20><><EFBFBD><EFBFBD>
--- 318909,318910 ----
***************
*** 318935,318950 ****
<20><>
- <20><>
<20><>
- <20><>
- <20><>
- <20><><EFBFBD>
<20><><EFBFBD><EFBFBD>
- <20><><EFBFBD>
<20><><EFBFBD>
- <20><><EFBFBD><EFBFBD>
<20><><EFBFBD><EFBFBD>
- <20><><EFBFBD><EFBFBD>
<20><><EFBFBD><EFBFBD>
<20><><EFBFBD><EFBFBD><EFBFBD>
- <20><><EFBFBD>
<20><><EFBFBD><EFBFBD>
--- 318932,318939 ----
***************
*** 318954,318964 ****
<20>
- <20><>
<20><><EFBFBD>
- <20><>
<20><>
- <20><><EFBFBD>
<20><><EFBFBD>
- <20><><EFBFBD>
<20><><EFBFBD>
- <20><><EFBFBD><EFBFBD>
<20><><EFBFBD>
--- 318943,318948 ----
***************
*** 318978,318980 ****
<20><><EFBFBD><EFBFBD><EFBFBD>
- <20><>
<20><><EFBFBD>
--- 318962,318963 ----
***************
*** 318996,319003 ****
<20><>
- <20><><EFBFBD>
<20><><EFBFBD>
- <20><><EFBFBD>
<20><><EFBFBD><EFBFBD>
<20><><EFBFBD><EFBFBD><EFBFBD>
- <20><><EFBFBD><EFBFBD>
<20><><EFBFBD><EFBFBD>
--- 318979,318983 ----

131
src/spell/nl_NL.diff
View File

@@ -1,13 +1,16 @@
*** nl_NL.orig.aff Wed Apr 20 11:48:16 2005
--- nl_NL.aff Mon Jun 27 22:07:02 2005
--- nl_NL.aff Wed Jun 29 17:29:49 2005
***************
*** 3,4 ****
--- 3,14 ----
--- 3,17 ----
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
+ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
+ SOFOTO ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
+
+ MIDWORD '-
+
+ KEP =
@@ -37,7 +40,7 @@
! SFX J 0 je [aeiou][bcdfgkpt]
! SFX J 0 jes [aeiou][bcdfgkpt]
--- 43,62 ----
--- 46,65 ----
SFX J N 18
! SFX J 0 tje [aeiou][aeiou]
! SFX J 0 tjes [aeiou][aeiou]
@@ -63,7 +66,7 @@
REP ubi ibu
! REP croc krok
REP ten than
--- 263,265 ----
--- 266,268 ----
REP ubi ibu
! REP croc krok
REP ten than
@@ -72,7 +75,7 @@
REP capucino cappuccino
! REP celcius Celsius
REP kado cadeau
--- 298,300 ----
--- 301,303 ----
REP capucino cappuccino
! REP celcius Celsius
REP kado cadeau
@@ -85,7 +88,7 @@
REP kommittee comit<69>
! REP kwis quiz
REP kwissen quizzen
--- 304,310 ----
--- 307,313 ----
REP committee comit<69>
! REP komitee comit<69>
! REP komittee comit<69>
@@ -98,7 +101,7 @@
REP copy kopij
! REP pitoresque pittoreske
REP reikweite reikwijdte
--- 312,314 ----
--- 315,317 ----
REP copy kopij
! REP pitoresque pittoreske
REP reikweite reikwijdte
@@ -110,7 +113,7 @@
! REP kontekst context
! REP korrekt correct
REP kritikus criticus
--- 324,329 ----
--- 327,332 ----
REP klup club
! REP wiskid whizzkid
! REP kontakt contact
@@ -119,7 +122,7 @@
REP kritikus criticus
***************
*** 333 ****
--- 343,466 ----
--- 346,359 ----
REP aflassen afgelasten
+ REP svp s.v.p.
+ REP zoz z.o.z.
@@ -134,116 +137,6 @@
+ MAP c<>
+ MAP y<><79>
+ MAP s<>
+
+ # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
+
+ SAL AH(AEIOUY)-^ *H
+ SAL AR(AEIOUY)-^ *R
+ SAL A(HR)^ *
+ SAL A^ *
+ SAL AH(AEIOUY)- H
+ SAL AR(AEIOUY)- R
+ SAL A(HR) _
+ SAL <20>^ *
+ SAL <20>^ *
+ SAL BB- _
+ SAL B B
+ SAL CQ- _
+ SAL CIA X
+ SAL CH X
+ SAL C(EIY)- S
+ SAL CK K
+ SAL COUGH^ KF
+ SAL CC< C
+ SAL C K
+ SAL DG(EIY) K
+ SAL DD- _
+ SAL D T
+ SAL <20>< E
+ SAL EH(AEIOUY)-^ *H
+ SAL ER(AEIOUY)-^ *R
+ SAL E(HR)^ *
+ SAL ENOUGH^$ *NF
+ SAL E^ *
+ SAL EH(AEIOUY)- H
+ SAL ER(AEIOUY)- R
+ SAL E(HR) _
+ SAL FF- _
+ SAL F F
+ SAL GN^ N
+ SAL GN$ N
+ SAL GNS$ NS
+ SAL GNED$ N
+ SAL GH(AEIOUY)- K
+ SAL GH _
+ SAL GG9 K
+ SAL G K
+ SAL H H
+ SAL IH(AEIOUY)-^ *H
+ SAL IR(AEIOUY)-^ *R
+ SAL I(HR)^ *
+ SAL I^ *
+ SAL ING6 N
+ SAL IH(AEIOUY)- H
+ SAL IR(AEIOUY)- R
+ SAL I(HR) _
+ SAL J K
+ SAL KN^ N
+ SAL KK- _
+ SAL K K
+ SAL LAUGH^ LF
+ SAL LL- _
+ SAL L L
+ SAL MB$ M
+ SAL MM M
+ SAL M M
+ SAL NN- _
+ SAL N N
+ SAL OH(AEIOUY)-^ *H
+ SAL OR(AEIOUY)-^ *R
+ SAL O(HR)^ *
+ SAL O^ *
+ SAL OH(AEIOUY)- H
+ SAL OR(AEIOUY)- R
+ SAL O(HR) _
+ SAL PH F
+ SAL PN^ N
+ SAL PP- _
+ SAL P P
+ SAL Q K
+ SAL RH^ R
+ SAL ROUGH^ RF
+ SAL RR- _
+ SAL R R
+ SAL SCH(EOU)- SK
+ SAL SC(IEY)- S
+ SAL SH X
+ SAL SI(AO)- X
+ SAL SS- _
+ SAL S S
+ SAL TI(AO)- X
+ SAL TH @
+ SAL TCH-- _
+ SAL TOUGH^ TF
+ SAL TT- _
+ SAL T T
+ SAL UH(AEIOUY)-^ *H
+ SAL UR(AEIOUY)-^ *R
+ SAL U(HR)^ *
+ SAL U^ *
+ SAL UH(AEIOUY)- H
+ SAL UR(AEIOUY)- R
+ SAL U(HR) _
+ SAL V^ W
+ SAL V F
+ SAL WR^ R
+ SAL WH^ W
+ SAL W(AEIOU)- W
+ SAL X^ S
+ SAL X KS
+ SAL Y(AEIOU)- Y
+ SAL ZZ- _
+ SAL Z S
*** nl_NL.orig.dic Tue Apr 19 21:03:15 2005
--- nl_NL.dic Mon Jun 27 20:38:35 2005
***************

4
src/version.h
View File

@@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 28)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 28, compiled "
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 29)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 29, compiled "