aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/normal.c
diff options
context:
space:
mode:
authorkevinhwang91 <kevin.hwang@live.com>2021-05-20 21:15:31 +0800
committerkevinhwang91 <kevin.hwang@live.com>2021-05-20 21:15:31 +0800
commitd29148ffd812058cf7281607d1b6a9dd937d5d6c (patch)
tree8dc16d1b0949b0093a3fd71991ac3ed438fca4d6 /src/nvim/normal.c
parent2dc0f812710b19f8befcfa64ef9335cadc510296 (diff)
parent5d9c5601275abfa17396b3a80c7b958c48080807 (diff)
downloadrneovim-d29148ffd812058cf7281607d1b6a9dd937d5d6c.tar.gz
rneovim-d29148ffd812058cf7281607d1b6a9dd937d5d6c.tar.bz2
rneovim-d29148ffd812058cf7281607d1b6a9dd937d5d6c.zip
Merge remote-tracking branch 'origin/master' into qftf
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;