Mercurial > vim
comparison src/fileio.c @ 844:d3bbb5dd3913 v7.0f02
updated for version 7.0f02
author | vimboss |
---|---|
date | Thu, 27 Apr 2006 00:02:13 +0000 |
parents | 6bb1fa855dc9 |
children | 8cd729851562 |
comparison
equal
deleted
inserted
replaced
843:9f279ebda751 | 844:d3bbb5dd3913 |
---|---|
827 fenc = (char_u *)"utf-8"; | 827 fenc = (char_u *)"utf-8"; |
828 | 828 |
829 /* When the file is utf-8 but a character doesn't fit in | 829 /* When the file is utf-8 but a character doesn't fit in |
830 * 'encoding' don't retry. In help text editing utf-8 bytes | 830 * 'encoding' don't retry. In help text editing utf-8 bytes |
831 * doesn't make sense. */ | 831 * doesn't make sense. */ |
832 keep_dest_enc = TRUE; | 832 if (!enc_utf8) |
833 keep_dest_enc = TRUE; | |
833 } | 834 } |
834 fenc_alloced = FALSE; | 835 fenc_alloced = FALSE; |
835 } | 836 } |
836 else if (*p_fencs == NUL) | 837 else if (*p_fencs == NUL) |
837 { | 838 { |
7483 event_ignored(event) | 7484 event_ignored(event) |
7484 event_T event; | 7485 event_T event; |
7485 { | 7486 { |
7486 char_u *p = p_ei; | 7487 char_u *p = p_ei; |
7487 | 7488 |
7488 if (STRICMP(p_ei, "all") == 0) | 7489 while (*p != NUL) |
7489 return TRUE; | 7490 { |
7490 | 7491 if (STRNICMP(p, "all", 3) == 0 && (p[3] == NUL || p[3] == ',')) |
7491 while (*p) | 7492 return TRUE; |
7492 if (event_name2nr(p, &p) == event) | 7493 if (event_name2nr(p, &p) == event) |
7493 return TRUE; | 7494 return TRUE; |
7495 } | |
7494 | 7496 |
7495 return FALSE; | 7497 return FALSE; |
7496 } | 7498 } |
7497 | 7499 |
7498 /* | 7500 /* |
7501 int | 7503 int |
7502 check_ei() | 7504 check_ei() |
7503 { | 7505 { |
7504 char_u *p = p_ei; | 7506 char_u *p = p_ei; |
7505 | 7507 |
7506 if (STRICMP(p_ei, "all") == 0) | |
7507 return OK; | |
7508 | |
7509 while (*p) | 7508 while (*p) |
7510 if (event_name2nr(p, &p) == NUM_EVENTS) | 7509 { |
7510 if (STRNICMP(p, "all", 3) == 0 && (p[3] == NUL || p[3] == ',')) | |
7511 { | |
7512 p += 3; | |
7513 if (*p == ',') | |
7514 ++p; | |
7515 } | |
7516 else if (event_name2nr(p, &p) == NUM_EVENTS) | |
7511 return FAIL; | 7517 return FAIL; |
7518 } | |
7512 | 7519 |
7513 return OK; | 7520 return OK; |
7514 } | 7521 } |
7515 | 7522 |
7516 # if defined(FEAT_SYN_HL) || defined(PROTO) | 7523 # if defined(FEAT_SYN_HL) || defined(PROTO) |