aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/misc1.c2
-rw-r--r--src/nvim/ops.c2
-rw-r--r--src/nvim/version.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
index 4ab059c923..71aa6e83e5 100644
--- a/src/nvim/misc1.c
+++ b/src/nvim/misc1.c
@@ -566,7 +566,7 @@ open_line (
int i;
int l;
- for (i = 0; p[i] != NUL && i < lead_len; i += l) {
+ for (i = 0; i < lead_len && p[i] != NUL; i += l) {
l = (*mb_ptr2len)(p + i);
if (vim_strnsize(p, i + l) > repl_size)
break;
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index dfa89acb1a..9e95c1a3e7 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -4607,7 +4607,7 @@ int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1)
goto theend;
}
ptr = buf1;
- if (negative && (!visual || (visual && was_positive))) {
+ if (negative && (!visual || was_positive)) {
*ptr++ = '-';
}
if (pre) {
diff --git a/src/nvim/version.c b/src/nvim/version.c
index ce103ec7dd..c9167bf8fb 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -660,7 +660,7 @@ static int included_patches[] = {
// 1783,
1782,
// 1781,
- // 1780,
+ 1780,
1779,
// 1778 NA
// 1777 NA