Merge remote-tracking branch 'vim/master'

Author: splhack

src/channel.c

@@ -739,10 +739,10 @@ channel_open(
 	     * After putting the socket in non-blocking mode, connect() will
 	     * return EINPROGRESS, select() will not wait (as if writing is
 	     * possible), need to use getsockopt() to check if the socket is
-	     * actually connect.
-	     * We detect an failure to connect when both read and write fds
+	     * actually able to connect.
+	     * We detect an failure to connect when either read and write fds
 	     * are set.  Use getsockopt() to find out what kind of failure. */
-	    if (FD_ISSET(sd, &rfds) && FD_ISSET(sd, &wfds))
+	    if (FD_ISSET(sd, &rfds) || FD_ISSET(sd, &wfds))
 	    {
 		ret = getsockopt(sd,
 			    SOL_SOCKET, SO_ERROR, &so_error, &so_error_len);
@@ -1535,6 +1535,9 @@ may_invoke_callback(channel_T *channel, int part)
 	     * get everything we have. */
 	    msg = channel_get_all(channel, part);
 
+	if (msg == NULL)
+	    return FALSE; /* out of memory (and avoids Coverity warning) */
+
 	argv[1].v_type = VAR_STRING;
 	argv[1].vval.v_string = msg;
     }
@@ -1570,21 +1573,22 @@ may_invoke_callback(channel_T *channel, int part)
     {
 	if (buffer != NULL)
 	{
-	    buf_T	*save_curbuf = curbuf;
-	    linenr_T	lnum = buffer->b_ml.ml_line_count;
-
-	    /* Append to the buffer */
-	    ch_logn(channel, "appending line %d to buffer", (int)lnum + 1);
-
-	    curbuf = buffer;
-	    u_sync(TRUE);
-	    u_save(lnum, lnum + 1);
-
 	    if (msg == NULL)
 		/* JSON or JS mode: re-encode the message. */
 		msg = json_encode(listtv, ch_mode);
 	    if (msg != NULL)
 	    {
+		buf_T	    *save_curbuf = curbuf;
+		linenr_T    lnum = buffer->b_ml.ml_line_count;
+
+		/* Append to the buffer */
+		ch_logn(channel, "appending line %d to buffer", (int)lnum + 1);
+
+		curbuf = buffer;
+		u_sync(TRUE);
+		/* ignore undo failure, undo is not very useful here */
+		ignored = u_save(lnum, lnum + 1);
+
 		ml_append(lnum, msg, 0, FALSE);
 		appended_lines_mark(lnum, 1L);
 		curbuf = save_curbuf;

src/edit.c

@@ -1599,7 +1599,9 @@ ins_redraw(
 		curwin->w_p_cole > 0
 # endif
 		)
+# ifdef FEAT_AUTOCMD
 	&& !equalpos(last_cursormoved, curwin->w_cursor)
+# endif
 # ifdef FEAT_INS_EXPAND
 	&& !pum_visible()
 # endif
@@ -1625,12 +1627,16 @@ ins_redraw(
 # ifdef FEAT_CONCEAL
 	if (curwin->w_p_cole > 0)
 	{
+#  ifdef FEAT_AUTOCMD
 	    conceal_old_cursor_line = last_cursormoved.lnum;
+#  endif
 	    conceal_new_cursor_line = curwin->w_cursor.lnum;
 	    conceal_update_lines = TRUE;
 	}
 # endif
+# ifdef FEAT_AUTOCMD
 	last_cursormoved = curwin->w_cursor;
+# endif
     }
 #endif
 

src/eval.c

@@ -3152,8 +3152,8 @@ tv_op(typval_T *tv1, typval_T *tv2, char_u *op)
 		}
 		return OK;
 
-#ifdef FEAT_FLOAT
 	    case VAR_FLOAT:
+#ifdef FEAT_FLOAT
 		{
 		    float_T f;
 
@@ -3170,8 +3170,8 @@ tv_op(typval_T *tv1, typval_T *tv2, char_u *op)
 		    else
 			tv1->vval.v_float -= f;
 		}
-		return OK;
 #endif
+		return OK;
 	}
     }
 
@@ -8011,8 +8011,8 @@ tv2string(
 	case VAR_STRING:
 	    *tofree = string_quote(tv->vval.v_string, FALSE);
 	    return *tofree;
-#ifdef FEAT_FLOAT
 	case VAR_FLOAT:
+#ifdef FEAT_FLOAT
 	    *tofree = NULL;
 	    vim_snprintf((char *)numbuf, NUMBUFLEN - 1, "%g", tv->vval.v_float);
 	    return numbuf;

src/main.c

@@ -1239,7 +1239,10 @@ main_loop(
 			curwin->w_p_cole > 0
 # endif
 			)
-		 && !equalpos(last_cursormoved, curwin->w_cursor))
+# ifdef FEAT_AUTOCMD
+		 && !equalpos(last_cursormoved, curwin->w_cursor)
+# endif
+		 )
 	    {
 # ifdef FEAT_AUTOCMD
 		if (has_cursormoved())
@@ -1249,12 +1252,16 @@ main_loop(
 # ifdef FEAT_CONCEAL
 		if (curwin->w_p_cole > 0)
 		{
+#  ifdef FEAT_AUTOCMD
 		    conceal_old_cursor_line = last_cursormoved.lnum;
+#  endif
 		    conceal_new_cursor_line = curwin->w_cursor.lnum;
 		    conceal_update_lines = TRUE;
 		}
 # endif
+# ifdef FEAT_AUTOCMD
 		last_cursormoved = curwin->w_cursor;
+# endif
 	    }
 #endif
 

src/os_unix.c

@@ -5257,9 +5257,9 @@ mch_clear_job(job_T *job)
 {
     /* call waitpid because child process may become zombie */
 # ifdef __NeXT__
-    wait4(job->jv_pid, NULL, WNOHANG, (struct rusage *)0);
+    (void)wait4(job->jv_pid, NULL, WNOHANG, (struct rusage *)0);
 # else
-    waitpid(job->jv_pid, NULL, WNOHANG);
+    (void)waitpid(job->jv_pid, NULL, WNOHANG);
 # endif
 }
 #endif

src/syntax.c

@@ -6342,9 +6342,11 @@ ex_ownsyntax(exarg_T *eap)
     if (old_value != NULL)
 	old_value = vim_strsave(old_value);
 
+#ifdef FEAT_AUTOCMD
     /* Apply the "syntax" autocommand event, this finds and loads the syntax
      * file. */
     apply_autocmds(EVENT_SYNTAX, eap->arg, curbuf->b_fname, TRUE, curbuf);
+#endif
 
     /* move value of b:current_syntax to w:current_syntax */
     new_value = get_var_value((char_u *)"b:current_syntax");

src/version.c

@@ -758,6 +758,18 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1474,
+/**/
+    1473,
+/**/
+    1472,
+/**/
+    1471,
+/**/
+    1470,
+/**/
+    1469,
 /**/
     1468,
 /**/