Merge pull request #16386 from VVKot/vim-8.2.2922

vim-patch:8.2.2922,8.2.3639

src/nvim/hardcopy.c

@@ -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_FONTSIZE     (10)
 
-#define PRT_MEDIASIZE_LEN  (sizeof(prt_mediasize) / \
-                            sizeof(struct prt_mediasize_S))
+#define PRT_MEDIASIZE_LEN  ARRAY_SIZE(prt_mediasize)
 
 static struct prt_mediasize_S prt_mediasize[] =
 {

src/nvim/memory.c

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