aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/normal.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-05-19 21:36:31 -0400
committerGitHub <noreply@github.com>2021-05-19 21:36:31 -0400
commit30befcdce47b4964b4d2a5aeb078ddec8e2fcc0b (patch)
treed8df645e9f993a6903dda09fdf5d24c45680850b /src/nvim/normal.c
parent045e47ec5522b6449e849bc343697ab81ebd7814 (diff)
parent49ab1b91e7cccb4fc5edad6d2fa8c547fb38942b (diff)
downloadrneovim-30befcdce47b4964b4d2a5aeb078ddec8e2fcc0b.tar.gz
rneovim-30befcdce47b4964b4d2a5aeb078ddec8e2fcc0b.tar.bz2
rneovim-30befcdce47b4964b4d2a5aeb078ddec8e2fcc0b.zip
Merge pull request #14592 from janlazo/vim-8.2.2869
vim-patch:8.2.{2869,2871}
Diffstat (limited to 'src/nvim/normal.c')
-rw-r--r--src/nvim/normal.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 2f4c441beb..13706fb14a 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -1942,10 +1942,12 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
case OP_FORMAT:
if (*curbuf->b_p_fex != NUL) {
op_formatexpr(oap); // use expression
- } else if (*p_fp != NUL || *curbuf->b_p_fp != NUL) {
- op_colon(oap); // use external command
} else {
- op_format(oap, false); // use internal function
+ if (*p_fp != NUL || *curbuf->b_p_fp != NUL) {
+ op_colon(oap); // use external command
+ } else {
+ op_format(oap, false); // use internal function
+ }
}
break;