aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-08-26 06:54:11 +0800
committerzeertzjq <zeertzjq@outlook.com>2022-08-26 07:00:50 +0800
commit4dd34989cdd88fd75a38572b4bca9361d557943f (patch)
tree3b4fe086f30cca4275515e1b754d1d161bd8a943
parent6e9980fc3b6f8e246632aef0f4b8c0edf30e24f0 (diff)
downloadrneovim-4dd34989cdd88fd75a38572b4bca9361d557943f.tar.gz
rneovim-4dd34989cdd88fd75a38572b4bca9361d557943f.tar.bz2
rneovim-4dd34989cdd88fd75a38572b4bca9361d557943f.zip
vim-patch:9.0.0263: too many #ifdefs
Problem: Too many #ifdefs. Solution: Make some functions always available. https://github.com/vim/vim/commit/6d4b2f54df5d533eb0794331f38445a6ca5d3a3f N/A patches for version.c: vim-patch:9.0.0262: build failure without the +quickfix feature Problem: Build failure without the +quickfix feature. Solution: Add #ifdef. https://github.com/vim/vim/commit/2e6dcbc4450c98bd12faace5d77a65f2afddae44 vim-patch:9.0.0266: compiler warning for unused argument Problem: Compiler warning for unused argument. Solution: Add UNUSED. https://github.com/vim/vim/commit/340dafd155222ac96304107542344faf3c56e12b vim-patch:9.0.0268: build error without the +eval feature Problem: Build error without the +eval feature. Solution: Remove #ifdef. https://github.com/vim/vim/commit/0166e398d11a09662d783fe5db62b414045880f8
-rw-r--r--src/nvim/change.c3
-rw-r--r--src/nvim/ex_cmds.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/change.c b/src/nvim/change.c
index 45ff2ceacb..1d545927ad 100644
--- a/src/nvim/change.c
+++ b/src/nvim/change.c
@@ -96,8 +96,7 @@ void changed(void)
// Create a swap file if that is wanted.
// Don't do this for "nofile" and "nowrite" buffer types.
- if (curbuf->b_may_swap
- && !bt_dontwrite(curbuf)) {
+ if (curbuf->b_may_swap && !bt_dontwrite(curbuf)) {
bool save_need_wait_return = need_wait_return;
need_wait_return = false;
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index e08e977ff5..69208cff99 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -1880,8 +1880,7 @@ int do_write(exarg_T *eap)
// Writing to the current file is not allowed in readonly mode
// and a file name is required.
// "nofile" and "nowrite" buffers cannot be written implicitly either.
- if (!other && (bt_dontwrite_msg(curbuf)
- || check_fname() == FAIL
+ if (!other && (bt_dontwrite_msg(curbuf) || check_fname() == FAIL
|| check_readonly(&eap->forceit, curbuf))) {
goto theend;
}