|
 |
d6ba96 |
To: vim_dev@googlegroups.com
|
|
|
d6ba96 |
Subject: Patch 7.4.049
|
|
|
d6ba96 |
Fcc: outbox
|
|
|
d6ba96 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d6ba96 |
Mime-Version: 1.0
|
|
|
d6ba96 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d6ba96 |
Content-Transfer-Encoding: 8bit
|
|
|
d6ba96 |
------------
|
|
|
d6ba96 |
|
|
|
d6ba96 |
Patch 7.4.049
|
|
|
d6ba96 |
Problem: In Ex mode, when line numbers are enabled the substitute prompt is
|
|
|
d6ba96 |
wrong.
|
|
|
d6ba96 |
Solution: Adjust for the line number size. (Benoit Pierre)
|
|
|
d6ba96 |
Files: src/ex_cmds.c
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.048/src/ex_cmds.c 2013-08-07 15:15:51.000000000 +0200
|
|
|
d6ba96 |
--- src/ex_cmds.c 2013-10-02 18:31:24.000000000 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 4740,4750 ****
|
|
|
d6ba96 |
char_u *resp;
|
|
|
d6ba96 |
colnr_T sc, ec;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
! print_line_no_prefix(lnum, FALSE, FALSE);
|
|
|
d6ba96 |
|
|
|
d6ba96 |
getvcol(curwin, &curwin->w_cursor, &sc, NULL, NULL);
|
|
|
d6ba96 |
curwin->w_cursor.col = regmatch.endpos[0].col - 1;
|
|
|
d6ba96 |
getvcol(curwin, &curwin->w_cursor, NULL, NULL, &ec);
|
|
|
d6ba96 |
msg_start();
|
|
|
d6ba96 |
for (i = 0; i < (long)sc; ++i)
|
|
|
d6ba96 |
msg_putchar(' ');
|
|
|
d6ba96 |
--- 4740,4756 ----
|
|
|
d6ba96 |
char_u *resp;
|
|
|
d6ba96 |
colnr_T sc, ec;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
! print_line_no_prefix(lnum, do_number, do_list);
|
|
|
d6ba96 |
|
|
|
d6ba96 |
getvcol(curwin, &curwin->w_cursor, &sc, NULL, NULL);
|
|
|
d6ba96 |
curwin->w_cursor.col = regmatch.endpos[0].col - 1;
|
|
|
d6ba96 |
getvcol(curwin, &curwin->w_cursor, NULL, NULL, &ec);
|
|
|
d6ba96 |
+ if (do_number || curwin->w_p_nu)
|
|
|
d6ba96 |
+ {
|
|
|
d6ba96 |
+ int numw = number_width(curwin) + 1;
|
|
|
d6ba96 |
+ sc += numw;
|
|
|
d6ba96 |
+ ec += numw;
|
|
|
d6ba96 |
+ }
|
|
|
d6ba96 |
msg_start();
|
|
|
d6ba96 |
for (i = 0; i < (long)sc; ++i)
|
|
|
d6ba96 |
msg_putchar(' ');
|
|
|
d6ba96 |
*** ../vim-7.4.048/src/version.c 2013-10-02 18:22:58.000000000 +0200
|
|
|
d6ba96 |
--- src/version.c 2013-10-02 18:33:22.000000000 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 740,741 ****
|
|
|
d6ba96 |
--- 740,743 ----
|
|
|
d6ba96 |
{ /* Add new patch number below this line */
|
|
|
d6ba96 |
+ /**/
|
|
|
d6ba96 |
+ 49,
|
|
|
d6ba96 |
/**/
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--
|
|
|
d6ba96 |
What the word 'politics' means: 'Poli' in Latin meaning 'many' and 'tics'
|
|
|
d6ba96 |
meaning 'bloodsucking creatures'.
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d6ba96 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d6ba96 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
d6ba96 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|