From ddc401a91cc7d1dfb534172158a6b4bae4c0eb48 Mon Sep 17 00:00:00 2001 From: VVKot Date: Sun, 21 Nov 2021 07:24:07 +0000 Subject: vim-patch:8.2.2922: computing array length is done in various ways Problem: Computing array length is done in various ways. Solution: Use ARRAY_LENGTH everywhere. (Ken Takata, closes vim/vim#8305) https://github.com/vim/vim/commit/eeec2548785b2dd245a31ab25d7bde0f88ea1a6d --- src/nvim/hardcopy.c | 3 +-- src/nvim/main.c | 2 +- src/nvim/memory.c | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src') 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/main.c b/src/nvim/main.c index 921bc883cf..5cccb6ca71 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -677,7 +677,7 @@ void getout(int exitval) if (did_emsg) { // give the user a chance to read the (error) message no_wait_return = FALSE; - wait_return(FALSE); +// wait_return(FALSE); } // Position the cursor again, the autocommands may have moved it 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(); -- cgit From ad71ecb49b0e8c44c3747738c9e46309abbf8e76 Mon Sep 17 00:00:00 2001 From: VVKot Date: Sun, 21 Nov 2021 13:52:31 +0000 Subject: vim-patch:8.2.3639: line commented out accidentally Problem: Line commented out accidentally. Solution: Uncomment. (Volodymyr Kot, closes vim/vim#9172) https://github.com/vim/vim/commit/7f0c4b418e01d6e056a74de2f22fcbad613b7591 --- src/nvim/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/main.c b/src/nvim/main.c index 5cccb6ca71..921bc883cf 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -677,7 +677,7 @@ void getout(int exitval) if (did_emsg) { // give the user a chance to read the (error) message no_wait_return = FALSE; -// wait_return(FALSE); + wait_return(FALSE); } // Position the cursor again, the autocommands may have moved it -- cgit