From 271bb32855853b011fceaf0ad2f829bce66b2a19 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sun, 3 Apr 2022 01:37:28 -0700 Subject: vim-patch:8.2.4639: not sufficient parenthesis in preprocessor macros Problem: Not sufficient parenthesis in preprocessor macros. Solution: Add more parenthesis. https://github.com/vim/vim/commit/9dac9b1751dd43c02470cc6a2aecaeea27abcc80 --- src/nvim/buffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/buffer.h') diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h index 9e2ca999e4..850ab175a5 100644 --- a/src/nvim/buffer.h +++ b/src/nvim/buffer.h @@ -23,7 +23,7 @@ enum getf_retvalues { GETFILE_ERROR = 1, // normal error GETFILE_NOT_WRITTEN = 2, // "not written" error GETFILE_SAME_FILE = 0, // success, same file - GETFILE_OPEN_OTHER = -1, // success, opened another file + GETFILE_OPEN_OTHER = (-1), // success, opened another file GETFILE_UNUSED = 8, }; -- cgit From 44b59d1a696b35d2520dbea2de3aab01e740a7ca Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 7 Apr 2022 21:46:07 +0800 Subject: vim-patch:8.2.0004: get E685 and E931 if buffer reload is interrupted Problem: Get E685 and E931 if buffer reload is interrupted. Solution: Do not abort deleting a dummy buffer. (closes vim/vim#5361) https://github.com/vim/vim/commit/a6e8f888e7fc31b8ab7233509254fb2e2fe4089f --- src/nvim/buffer.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/nvim/buffer.h') diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h index 850ab175a5..7f4bbcc9e5 100644 --- a/src/nvim/buffer.h +++ b/src/nvim/buffer.h @@ -58,9 +58,10 @@ enum dobuf_start_values { // flags for buf_freeall() enum bfa_values { - BFA_DEL = 1, // buffer is going to be deleted - BFA_WIPE = 2, // buffer is going to be wiped out - BFA_KEEP_UNDO = 4, // do not free undo information + BFA_DEL = 1, // buffer is going to be deleted + BFA_WIPE = 2, // buffer is going to be wiped out + BFA_KEEP_UNDO = 4, // do not free undo information + BFA_IGNORE_ABORT = 8, // do not abort for aborting() }; #ifdef INCLUDE_GENERATED_DECLARATIONS -- cgit From 0d41c4dee126b6d93ee8ed82302af47df9a50576 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Wed, 27 Apr 2022 06:38:12 +0200 Subject: refactor(build): remove unused includes #17078 Remove unused includes in src/nvim/buffer.c|h using the IWYU library. Yet another step towards #6371 and #549 --- src/nvim/buffer.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/nvim/buffer.h') diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h index 7f4bbcc9e5..b452eb227e 100644 --- a/src/nvim/buffer.h +++ b/src/nvim/buffer.h @@ -2,14 +2,11 @@ #define NVIM_BUFFER_H #include "nvim/eval.h" -#include "nvim/ex_cmds_defs.h" // for exarg_T #include "nvim/func_attr.h" #include "nvim/macros.h" #include "nvim/memline.h" #include "nvim/pos.h" // for linenr_T #include "nvim/screen.h" // for StlClickRecord -#include "nvim/vim.h" -#include "nvim/window.h" // Values for buflist_getfile() enum getf_values { -- cgit