|
 |
2102f06 |
To: vim-dev@vim.org
|
|
|
2102f06 |
Subject: Patch 7.2.152
|
|
|
2102f06 |
Fcc: outbox
|
|
|
2102f06 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
2102f06 |
Mime-Version: 1.0
|
|
|
2102f06 |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
2102f06 |
Content-Transfer-Encoding: 8bit
|
|
|
2102f06 |
------------
|
|
|
2102f06 |
|
|
|
2102f06 |
Patch 7.2.152
|
|
|
2102f06 |
Problem: When using "silent echo x" inside ":redir" a next echo may start
|
|
|
2102f06 |
halfway the line. (Tony Mechelynck, Dennis Benzinger)
|
|
|
2102f06 |
Solution: Reset msg_col after redirecting silently.
|
|
|
2102f06 |
Files: src/ex_docmd.c, src/message.c, src/proto/message.pro
|
|
|
2102f06 |
|
|
|
2102f06 |
|
|
|
2102f06 |
*** ../vim-7.2.151/src/ex_docmd.c Wed Mar 18 12:50:58 2009
|
|
|
2102f06 |
--- src/ex_docmd.c Wed Apr 22 11:57:49 2009
|
|
|
2102f06 |
***************
|
|
|
2102f06 |
*** 2699,2704 ****
|
|
|
2102f06 |
--- 2699,2709 ----
|
|
|
2102f06 |
/* Restore msg_scroll, it's set by file I/O commands, even when no
|
|
|
2102f06 |
* message is actually displayed. */
|
|
|
2102f06 |
msg_scroll = save_msg_scroll;
|
|
|
2102f06 |
+
|
|
|
2102f06 |
+ /* "silent reg" or "silent echo x" inside "redir" leaves msg_col
|
|
|
2102f06 |
+ * somewhere in the line. Put it back in the first column. */
|
|
|
2102f06 |
+ if (redirecting())
|
|
|
2102f06 |
+ msg_col = 0;
|
|
|
2102f06 |
}
|
|
|
2102f06 |
|
|
|
2102f06 |
#ifdef HAVE_SANDBOX
|
|
|
2102f06 |
*** ../vim-7.2.151/src/message.c Tue Feb 24 04:36:50 2009
|
|
|
2102f06 |
--- src/message.c Sun Apr 12 14:08:25 2009
|
|
|
2102f06 |
***************
|
|
|
2102f06 |
*** 3023,3033 ****
|
|
|
2102f06 |
if (*p_vfile != NUL)
|
|
|
2102f06 |
verbose_write(s, maxlen);
|
|
|
2102f06 |
|
|
|
2102f06 |
! if (redir_fd != NULL
|
|
|
2102f06 |
! #ifdef FEAT_EVAL
|
|
|
2102f06 |
! || redir_reg || redir_vname
|
|
|
2102f06 |
! #endif
|
|
|
2102f06 |
! )
|
|
|
2102f06 |
{
|
|
|
2102f06 |
/* If the string doesn't start with CR or NL, go to msg_col */
|
|
|
2102f06 |
if (*s != '\n' && *s != '\r')
|
|
|
2102f06 |
--- 3023,3029 ----
|
|
|
2102f06 |
if (*p_vfile != NUL)
|
|
|
2102f06 |
verbose_write(s, maxlen);
|
|
|
2102f06 |
|
|
|
2102f06 |
! if (redirecting())
|
|
|
2102f06 |
{
|
|
|
2102f06 |
/* If the string doesn't start with CR or NL, go to msg_col */
|
|
|
2102f06 |
if (*s != '\n' && *s != '\r')
|
|
|
2102f06 |
***************
|
|
|
2102f06 |
*** 3074,3079 ****
|
|
|
2102f06 |
--- 3070,3085 ----
|
|
|
2102f06 |
}
|
|
|
2102f06 |
}
|
|
|
2102f06 |
|
|
|
2102f06 |
+ int
|
|
|
2102f06 |
+ redirecting()
|
|
|
2102f06 |
+ {
|
|
|
2102f06 |
+ return redir_fd != NULL
|
|
|
2102f06 |
+ #ifdef FEAT_EVAL
|
|
|
2102f06 |
+ || redir_reg || redir_vname
|
|
|
2102f06 |
+ #endif
|
|
|
2102f06 |
+ ;
|
|
|
2102f06 |
+ }
|
|
|
2102f06 |
+
|
|
|
2102f06 |
/*
|
|
|
2102f06 |
* Before giving verbose message.
|
|
|
2102f06 |
* Must always be called paired with verbose_leave()!
|
|
|
2102f06 |
*** ../vim-7.2.151/src/proto/message.pro Sat May 5 19:35:34 2007
|
|
|
2102f06 |
--- src/proto/message.pro Sun Apr 12 14:08:50 2009
|
|
|
2102f06 |
***************
|
|
|
2102f06 |
*** 54,59 ****
|
|
|
2102f06 |
--- 54,60 ----
|
|
|
2102f06 |
void msg_clr_cmdline __ARGS((void));
|
|
|
2102f06 |
int msg_end __ARGS((void));
|
|
|
2102f06 |
void msg_check __ARGS((void));
|
|
|
2102f06 |
+ int redirecting __ARGS((void));
|
|
|
2102f06 |
void verbose_enter __ARGS((void));
|
|
|
2102f06 |
void verbose_leave __ARGS((void));
|
|
|
2102f06 |
void verbose_enter_scroll __ARGS((void));
|
|
|
2102f06 |
*** ../vim-7.2.151/src/version.c Wed Apr 22 13:50:14 2009
|
|
|
2102f06 |
--- src/version.c Wed Apr 22 14:40:22 2009
|
|
|
2102f06 |
***************
|
|
|
2102f06 |
*** 678,679 ****
|
|
|
2102f06 |
--- 678,681 ----
|
|
|
2102f06 |
{ /* Add new patch number below this line */
|
|
|
2102f06 |
+ /**/
|
|
|
2102f06 |
+ 152,
|
|
|
2102f06 |
/**/
|
|
|
2102f06 |
|
|
|
2102f06 |
--
|
|
|
2102f06 |
Q: How does a UNIX Guru pick up a girl?
|
|
|
2102f06 |
A: look; grep; which; eval; nice; uname; talk; date;
|
|
|
2102f06 |
|
|
|
2102f06 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
2102f06 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
2102f06 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
2102f06 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|