diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-05-24 21:34:22 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-05-24 21:34:22 +0200 |
| commit | 442b4225d3310599a8bc9107dc3f7b4153a286c4 (patch) | |
| tree | 518b9298185272fad43e5afbc8a7cde21dc867e8 /src/fileio.c | |
| parent | e66194a54e0303568e7db1cb8772e2709afd864c (diff) | |
| download | vim-git-442b4225d3310599a8bc9107dc3f7b4153a286c4.tar.gz | |
Improve the MS-Windows installer.
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c index 779a0d6a9..f8375c65d 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2848,7 +2848,7 @@ get_crypt_method(ptr, len) return i; } - i = STRLEN(crypt_magic_head); + i = (int)STRLEN(crypt_magic_head); if (len >= i && memcmp(ptr, crypt_magic_head, i) == 0) EMSG(_("E821: File is encrypted with unknown method")); @@ -4409,7 +4409,7 @@ restore_backup: ptr = ml_get_buf(buf, lnum, FALSE) - 1; #ifdef FEAT_PERSISTENT_UNDO if (write_undo_file) - sha256_update(&sha_ctx, ptr + 1, STRLEN(ptr + 1) + 1); + sha256_update(&sha_ctx, ptr + 1, (UINT32_T)(STRLEN(ptr + 1) + 1)); #endif while ((c = *++ptr) != NUL) { @@ -5675,7 +5675,10 @@ need_conversion(fenc) int fenc_flags; if (*fenc == NUL || STRCMP(p_enc, fenc) == 0) + { same_encoding = TRUE; + fenc_flags = 0; + } else { /* Ignore difference between "ansi" and "latin1", "ucs-4" and |