Merge pull request #16386 from VVKot/vim-8.2.2922

vim-patch:8.2.2922,8.2.3639
This commit is contained in:
Jan Edmund Lazo 2021-11-21 20:41:56 -05:00 committed by GitHub
commit f45b2f313e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions

View File

@ -986,8 +986,7 @@ static colnr_T hardcopy_line(prt_settings_T *psettings, int page_line, prt_pos_T
#define PRT_PS_DEFAULT_DPI (72) // Default user space resolution #define PRT_PS_DEFAULT_DPI (72) // Default user space resolution
#define PRT_PS_DEFAULT_FONTSIZE (10) #define PRT_PS_DEFAULT_FONTSIZE (10)
#define PRT_MEDIASIZE_LEN (sizeof(prt_mediasize) / \ #define PRT_MEDIASIZE_LEN ARRAY_SIZE(prt_mediasize)
sizeof(struct prt_mediasize_S))
static struct prt_mediasize_S prt_mediasize[] = static struct prt_mediasize_S prt_mediasize[] =
{ {

View File

@ -573,7 +573,6 @@ void free_all_mem(void)
return; return;
} }
entered_free_all_mem = true; entered_free_all_mem = true;
// Don't want to trigger autocommands from here on. // Don't want to trigger autocommands from here on.
block_autocmds(); block_autocmds();