Mercurial > vim

changeset 2491:904cd1c26a1e vim73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
After entering a crypt key would need to hit return to continue. When silencing a message it would still clear a kept message.
author Bram Moolenaar <bram@vim.org>
date Wed, 04 Aug 2010 20:12:32 +0200
parents 1e5bc1cdec13
children c945fdb34ce3
files src/message.c src/misc2.c
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/message.c
+++ b/src/message.c
@@ -1135,8 +1135,11 @@ msg_start()
 {
     int		did_return = FALSE;
 
-    vim_free(keep_msg);
-    keep_msg = NULL;			/* don't display old message now */
+    if (!msg_silent)
+    {
+	vim_free(keep_msg);
+	keep_msg = NULL;		/* don't display old message now */
+    }
 
 #ifdef FEAT_EVAL
     if (need_clr_eos)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -4016,9 +4016,9 @@ get_crypt_key(store, twice)
     }
 
     /* since the user typed this, no need to wait for return */
-    need_wait_return = FALSE;
     if (msg_didout)
 	msg_putchar('\n');
+    need_wait_return = FALSE;
     msg_didout = FALSE;
 
     free_crypt_key(p2);