Permalink
Browse files

updated for version 7.3.483

Problem:    More prompt shows up too often.
Solution:   Instead of adding a line break, only start a new line in the
	    message history. (Christian Brabandt)
  • Loading branch information...
1 parent 0b8d1d6 commit 4c09c4df7b120e87cbadc3efb3294986e12d8346 @brammool brammool committed Mar 28, 2012
Showing with 17 additions and 3 deletions.
  1. +4 −3 src/eval.c
  2. +10 −0 src/message.c
  3. +1 −0 src/proto/message.pro
  4. +2 −0 src/version.c
View
7 src/eval.c
@@ -20493,9 +20493,10 @@ ex_echo(eap)
* may cause a message to appear. */
if (eap->cmdidx == CMD_echo)
{
- /* Put the output below the command, makes scrolling back
- * at more prompt work. */
- msg_didout = TRUE;
+ /* Mark the saved text as finishing the line, so that what
+ * follows is displayed on a new line when scrolling back
+ * at the more prompt. */
+ msg_sb_eol();
msg_start();
}
}
View
10 src/message.c
@@ -2348,6 +2348,16 @@ msg_sb_start(mps)
}
/*
+ * Mark the last message chunk as finishing the line.
+ */
+ void
+msg_sb_eol()
+{
+ if (last_msgchunk != NULL)
+ last_msgchunk->sb_eol = TRUE;
+}
+
+/*
* Display a screen line from previously displayed text at row "row".
* Returns a pointer to the text for the next line (can be NULL).
*/
View
1 src/proto/message.pro
@@ -45,6 +45,7 @@ void msg_puts_attr __ARGS((char_u *s, int attr));
void may_clear_sb_text __ARGS((void));
void clear_sb_text __ARGS((void));
void show_sb_text __ARGS((void));
+void msg_sb_eol __ARGS((void));
int msg_use_printf __ARGS((void));
void mch_errmsg __ARGS((char *str));
void mch_msg __ARGS((char *str));
View
2 src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 483,
+/**/
482,
/**/
481,

0 comments on commit 4c09c4d

Please sign in to comment.