From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 2 Oct 2013 16:43:06 +0000 (+0200)
Subject: updated for version 7.4.049
X-Git-Tag: v7.4.049
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3eead7c227e96f416e62214a3529ad1e8b1c8421;p=vim

updated for version 7.4.049
Problem:    In Ex mode, when line numbers are enabled the substitute prompt is
            wrong.
Solution:   Adjust for the line number size. (Benoit Pierre)
---

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index b79a25911..76cc8f6d2 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4740,11 +4740,17 @@ do_sub(eap)
 			    char_u	*resp;
 			    colnr_T	sc, ec;
 
-			    print_line_no_prefix(lnum, FALSE, FALSE);
+			    print_line_no_prefix(lnum, do_number, do_list);
 
 			    getvcol(curwin, &curwin->w_cursor, &sc, NULL, NULL);
 			    curwin->w_cursor.col = regmatch.endpos[0].col - 1;
 			    getvcol(curwin, &curwin->w_cursor, NULL, NULL, &ec);
+			    if (do_number || curwin->w_p_nu)
+			    {
+				int numw = number_width(curwin) + 1;
+				sc += numw;
+				ec += numw;
+			    }
 			    msg_start();
 			    for (i = 0; i < (long)sc; ++i)
 				msg_putchar(' ');
diff --git a/src/version.c b/src/version.c
index 5a916a9e8..7b3e7edf0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    49,
 /**/
     48,
 /**/