diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 2 | ||||
| -rw-r--r-- | src/nvim/globals.h | 8 | ||||
| -rw-r--r-- | src/nvim/memory.c | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index f769016936..ea42a58cdd 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -21570,7 +21570,7 @@ void func_unref(char_u *name) fp = find_func(name); if (fp == NULL) { #ifdef EXITFREE - if (!entered_free_all_mem) + if (!entered_free_all_mem) // NOLINT(readability/braces) #endif EMSG2(_(e_intern2), "func_unref()"); } else { diff --git a/src/nvim/globals.h b/src/nvim/globals.h index bc98971c0b..872ff8d5b8 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -640,10 +640,10 @@ EXTERN int exiting INIT(= FALSE); // true when in or after free_all_mem() EXTERN bool entered_free_all_mem INIT(= false); #endif -/* volatile because it is used in signal handler deathtrap(). */ -EXTERN volatile int full_screen INIT(= FALSE); -/* TRUE when doing full-screen output - * otherwise only writing some messages */ +// volatile because it is used in signal handler deathtrap(). +EXTERN volatile int full_screen INIT(= false); +// TRUE when doing full-screen output +// otherwise only writing some messages EXTERN int restricted INIT(= FALSE); // TRUE when started in restricted mode (-Z) diff --git a/src/nvim/memory.c b/src/nvim/memory.c index ca6aa6381d..1884d55999 100644 --- a/src/nvim/memory.c +++ b/src/nvim/memory.c @@ -489,10 +489,11 @@ void free_all_mem(void) { buf_T *buf, *nextbuf; - /* When we cause a crash here it is caught and Vim tries to exit cleanly. - * Don't try freeing everything again. */ - if (entered_free_all_mem) + // When we cause a crash here it is caught and Vim tries to exit cleanly. + // Don't try freeing everything again. + if (entered_free_all_mem) { return; + } entered_free_all_mem = true; // Don't want to trigger autocommands from here on. |