0
0
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00

Improve the MS-Windows installer.

This commit is contained in:
Bram Moolenaar
2010-05-24 21:34:22 +02:00
parent e66194a54e
commit 442b4225d3
16 changed files with 146 additions and 80 deletions

View File

@@ -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