Merge pull request #4632 from KillTheMule/vim-7.4.822

vim-patch:7.4.822

7 files changed, 31 insertions, 25 deletions

diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index ecc6e2b7e8..d020bc8f20 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -5048,7 +5048,9 @@ helptags_one (
     /*
      * Sort the tags.
      */
-    sort_strings((char_u **)ga.ga_data, ga.ga_len);
+    if (ga.ga_data != NULL) {
+      sort_strings((char_u **)ga.ga_data, ga.ga_len);
+    }
 
     /*
      * Check for duplicates.
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index 2c8271c696..a0a0b9d3a5 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -2373,8 +2373,9 @@ static FILE *fopen_noinh_readbin(char *filename)
 # ifdef HAVE_FD_CLOEXEC
   {
     int fdflags = fcntl(fd_tmp, F_GETFD);
-    if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
-      fcntl(fd_tmp, F_SETFD, fdflags | FD_CLOEXEC);
+    if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) {
+      (void)fcntl(fd_tmp, F_SETFD, fdflags | FD_CLOEXEC);
+    }
   }
 # endif
 
diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 7f46a37315..ac3cf959c8 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -2110,10 +2110,11 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *gap, int level,
    */
   if (getlevel == foldlevelMarker && flp->start <= flp->lvl - level
       && flp->lvl > 0) {
-    foldFind(gap, startlnum - 1, &fp);
+    (void)foldFind(gap, startlnum - 1, &fp);
     if (fp >= ((fold_T *)gap->ga_data) + gap->ga_len
-        || fp->fd_top >= startlnum)
+        || fp->fd_top >= startlnum) {
       fp = NULL;
+    }
   }
 
   /*
@@ -2167,13 +2168,15 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *gap, int level,
         }
       }
       if (lvl < level + i) {
-        foldFind(&fp->fd_nested, flp->lnum - fp->fd_top, &fp2);
-        if (fp2 != NULL)
+        (void)foldFind(&fp->fd_nested, flp->lnum - fp->fd_top, &fp2);
+        if (fp2 != NULL) {
           bot = fp2->fd_top + fp2->fd_len - 1 + fp->fd_top;
-      } else if (fp->fd_top + fp->fd_len <= flp->lnum && lvl >= level)
-        finish = TRUE;
-      else
+        }
+      } else if (fp->fd_top + fp->fd_len <= flp->lnum && lvl >= level) {
+        finish = true;
+      } else {
         break;
+      }
     }
 
     /* At the start of the first nested fold and at the end of the current
diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c
index daddd7cee4..2f9ec0b3ff 100644
--- a/src/nvim/if_cscope.c
+++ b/src/nvim/if_cscope.c
@@ -1062,8 +1062,8 @@ static int cs_find_common(char *opt, char *pat, int forceit, int verbose,
       if (qf_init(wp, tmp, (char_u *)"%f%*\\t%l%*\\t%m",
               *qfpos == '-', cmdline) > 0) {
         if (postponed_split != 0) {
-          win_split(postponed_split > 0 ? postponed_split : 0,
-              postponed_split_flags);
+          (void)win_split(postponed_split > 0 ? postponed_split : 0,
+                          postponed_split_flags);
           RESET_BINDING(curwin);
           postponed_split = 0;
         }
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 9173ea2d17..75ee11bc9d 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -2598,11 +2598,10 @@ do_mouse (
         end_visual.col = leftcol;
       else
         end_visual.col = rightcol;
-      if (curwin->w_cursor.lnum <
-          (start_visual.lnum + end_visual.lnum) / 2)
-        end_visual.lnum = end_visual.lnum;
-      else
+      if (curwin->w_cursor.lnum >=
+          (start_visual.lnum + end_visual.lnum) / 2) {
         end_visual.lnum = start_visual.lnum;
+      }
 
       /* move VIsual to the right column */
       start_visual = curwin->w_cursor;              /* save the cursor pos */
@@ -3244,9 +3243,9 @@ void clear_showcmd(void)
       top = curwin->w_cursor.lnum;
       bot = VIsual.lnum;
     }
-    /* Include closed folds as a whole. */
-    hasFolding(top, &top, NULL);
-    hasFolding(bot, NULL, &bot);
+    // Include closed folds as a whole.
+    (void)hasFolding(top, &top, NULL);
+    (void)hasFolding(bot, NULL, &bot);
     lines = bot - top + 1;
 
     if (VIsual_mode == Ctrl_V) {
@@ -5154,9 +5153,10 @@ static void nv_gotofile(cmdarg_T *cap)
   ptr = grab_file_name(cap->count1, &lnum);
 
   if (ptr != NULL) {
-    /* do autowrite if necessary */
-    if (curbufIsChanged() && curbuf->b_nwindows <= 1 && !P_HID(curbuf))
-      autowrite(curbuf, false);
+    // do autowrite if necessary
+    if (curbufIsChanged() && curbuf->b_nwindows <= 1 && !P_HID(curbuf)) {
+      (void)autowrite(curbuf, false);
+    }
     setpcmark();
     (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LAST,
         P_HID(curbuf) ? ECMD_HIDE : 0, curwin);
diff --git a/src/nvim/version.c b/src/nvim/version.c
index ddc1b5a9a8..84d5342a80 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -855,7 +855,7 @@ static int included_patches[] = {
   825,
   // 824 NA
   823,
-  // 822,
+  822,
   // 821 NA
   820,
   819,
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 93a7a58678..bea55c465f 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -97,7 +97,7 @@ do_window (
      * don't replicate the quickfix buffer. */
     if (bt_quickfix(curbuf))
       goto newwindow;
-    win_split((int)Prenum, 0);
+    (void)win_split((int)Prenum, 0);
     break;
 
   /* split current window in two parts, vertically */
@@ -108,7 +108,7 @@ do_window (
      * don't replicate the quickfix buffer. */
     if (bt_quickfix(curbuf))
       goto newwindow;
-    win_split((int)Prenum, WSP_VERT);
+    (void)win_split((int)Prenum, WSP_VERT);
     break;
 
   /* split current window and edit alternate file */