From 5cecd7a93aba83cd477519974fc33fadbdcfdc87 Mon Sep 17 00:00:00 2001
From: ZviRackover <zvirack@gmail.com>
Date: Sun, 1 Jul 2018 22:58:42 +0300
Subject: style: fixing minor issues noted in code review.

---
 src/nvim/ops.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'src/nvim/ops.c')

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 05955f4215..041443d472 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -3639,18 +3639,12 @@ int do_join(size_t count,
     sumsize += currsize + spaces[t];
     endcurr1 = endcurr2 = NUL;
     if (insert_space && currsize > 0) {
-      if (has_mbyte) {
-        cend = curr + currsize;
+      cend = curr + currsize;
+      MB_PTR_BACK(curr, cend);
+      endcurr1 = utf_ptr2char(cend);
+      if (cend > curr) {
         MB_PTR_BACK(curr, cend);
-        endcurr1 = utf_ptr2char(cend);
-        if (cend > curr) {
-          MB_PTR_BACK(curr, cend);
-          endcurr2 = utf_ptr2char(cend);
-        }
-      } else {
-        endcurr1 = *(curr + currsize - 1);
-        if (currsize > 1)
-          endcurr2 = *(curr + currsize - 2);
+        endcurr2 = utf_ptr2char(cend);
       }
     }
     line_breakcheck();
-- 
cgit