Merge remote-tracking branch 'vim/master'

Author: splhack

src/auto/configure

@@ -9602,10 +9602,10 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN environment" >&5
-$as_echo_n "checking for CYGWIN environment... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN or MSYS environment" >&5
+$as_echo_n "checking for CYGWIN or MSYS environment... " >&6; }
 case `uname` in
-    CYGWIN*)    CYGWIN=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+    CYGWIN*|MSYS*)    CYGWIN=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN clipboard support" >&5
 $as_echo_n "checking for CYGWIN clipboard support... " >&6; }

src/configure.in

@@ -2861,9 +2861,9 @@ dnl end of GUI-checking
 dnl ---------------------------------------------------------------------------
 
 dnl Check for Cygwin, which needs an extra source file if not using X11
-AC_MSG_CHECKING(for CYGWIN environment)
+AC_MSG_CHECKING(for CYGWIN or MSYS environment)
 case `uname` in
-    CYGWIN*)    CYGWIN=yes; AC_MSG_RESULT(yes)
+    CYGWIN*|MSYS*)    CYGWIN=yes; AC_MSG_RESULT(yes)
                 AC_MSG_CHECKING(for CYGWIN clipboard support)
                 if test "x$with_x" = "xno" ; then
                   OS_EXTRA_SRC=winclip.c; OS_EXTRA_OBJ=objects/winclip.o

src/diff.c

@@ -1087,6 +1087,7 @@ ex_diffsplit(eap)
     exarg_T	*eap;
 {
     win_T	*old_curwin = curwin;
+    buf_T	*old_curbuf = curbuf;
 
 #ifdef FEAT_GUI
     need_mouse_correct = TRUE;
@@ -1105,7 +1106,18 @@ ex_diffsplit(eap)
 	{
 	    /* Set 'diff', 'scrollbind' on and 'wrap' off. */
 	    diff_win_options(curwin, TRUE);
-	    diff_win_options(old_curwin, TRUE);
+	    if (win_valid(old_curwin))
+	    {
+		diff_win_options(old_curwin, TRUE);
+
+		if (buf_valid(old_curbuf))
+		    /* Move the cursor position to that of the old window. */
+		    curwin->w_cursor.lnum = diff_get_corresponding_line(
+			    old_curbuf,
+			    old_curwin->w_cursor.lnum,
+			    curbuf,
+			    curwin->w_cursor.lnum);
+	    }
 	}
     }
 }
@@ -2541,7 +2553,6 @@ diff_move_to(dir, count)
     return OK;
 }
 
-#if defined(FEAT_CURSORBIND) || defined(PROTO)
     linenr_T
 diff_get_corresponding_line(buf1, lnum1, buf2, lnum3)
     buf_T	*buf1;
@@ -2610,7 +2621,6 @@ diff_get_corresponding_line(buf1, lnum1, buf2, lnum3)
 
     return lnum2;
 }
-#endif
 
 #if defined(FEAT_FOLDING) || defined(PROTO)
 /*

src/ex_cmds.c

@@ -540,10 +540,11 @@ ex_sort(eap)
 	if (!unique || i == 0
 		|| (sort_ic ? STRICMP(s, sortbuf1) : STRCMP(s, sortbuf1)) != 0)
 	{
-	    if (ml_append(lnum++, s, (colnr_T)0, FALSE) == FAIL)
+	    /* Copy the line into a buffer, it may become invalid in
+	     * ml_append(). And it's needed for "unique". */
+	    STRCPY(sortbuf1, s);
+	    if (ml_append(lnum++, sortbuf1, (colnr_T)0, FALSE) == FAIL)
 		break;
-	    if (unique)
-		STRCPY(sortbuf1, s);
 	}
 	fast_breakcheck();
 	if (got_int)

src/ex_getln.c

@@ -3079,12 +3079,12 @@ restore_cmdline_alloc(p)
 #endif
 
 /*
- * paste a yank register into the command line.
- * used by CTRL-R command in command-line mode
+ * Paste a yank register into the command line.
+ * Used by CTRL-R command in command-line mode.
  * insert_reg() can't be used here, because special characters from the
  * register contents will be interpreted as commands.
  *
- * return FAIL for failure, OK otherwise
+ * Return FAIL for failure, OK otherwise.
  */
     static int
 cmdline_paste(regname, literally, remcr)

src/ops.c

@@ -1577,7 +1577,7 @@ get_spec_reg(regname, argp, allocated, errmsg)
 cmdline_paste_reg(regname, literally, remcr)
     int regname;
     int literally;	/* Insert text literally instead of "as typed" */
-    int remcr;		/* don't add trailing CR */
+    int remcr;		/* don't add CR characters */
 {
     long	i;
 
@@ -1590,12 +1590,8 @@ cmdline_paste_reg(regname, literally, remcr)
 	cmdline_paste_str(y_current->y_array[i], literally);
 
 	/* Insert ^M between lines and after last line if type is MLINE.
-	 * Don't do this when "remcr" is TRUE and the next line is empty. */
-	if (y_current->y_type == MLINE
-		|| (i < y_current->y_size - 1
-		    && !(remcr
-			&& i == y_current->y_size - 2
-			&& *y_current->y_array[i + 1] == NUL)))
+	 * Don't do this when "remcr" is TRUE. */
+	if ((y_current->y_type == MLINE || i < y_current->y_size - 1) && !remcr)
 	    cmdline_paste_str((char_u *)"\r", literally);
 
 	/* Check for CTRL-C, in case someone tries to paste a few thousand

src/version.c

@@ -756,6 +756,14 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    976,
+/**/
+    975,
+/**/
+    974,
+/**/
+    973,
 /**/
     972,
 /**/