diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-11-21 20:41:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-21 20:41:56 -0500 |
| commit | f45b2f313e681a0ceed1e1ac6aff54ce07716544 (patch) | |
| tree | dc0b105166001eaac9b5490cff3ca8c074bcce6e /src | |
| parent | 04bfd20bb8dfa2cfa0ca357e3a9cea79ed47ad25 (diff) | |
| parent | ad71ecb49b0e8c44c3747738c9e46309abbf8e76 (diff) | |
| download | rneovim-f45b2f313e681a0ceed1e1ac6aff54ce07716544.tar.gz rneovim-f45b2f313e681a0ceed1e1ac6aff54ce07716544.tar.bz2 rneovim-f45b2f313e681a0ceed1e1ac6aff54ce07716544.zip | |
Merge pull request #16386 from VVKot/vim-8.2.2922
vim-patch:8.2.2922,8.2.3639
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/hardcopy.c | 3 | ||||
| -rw-r--r-- | src/nvim/memory.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c index 32b471efb0..93fcdc55a6 100644 --- a/src/nvim/hardcopy.c +++ b/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[] = { diff --git a/src/nvim/memory.c b/src/nvim/memory.c index 9683499eae..559a3cc435 100644 --- a/src/nvim/memory.c +++ b/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(); |