summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2008-03-11 14:31:09 +0000
committerBart Schaefer <barts@users.sourceforge.net>2008-03-11 14:31:09 +0000
commitb78caa8ec49317e7d42c8c0b0b71ae196f253524 (patch)
treea712f61245ba2e84576844509f698839a890c194
parente9b11fa9f00cb061d8f92d469a12d47b6d230214 (diff)
downloadzsh-b78caa8ec49317e7d42c8c0b0b71ae196f253524.tar.gz
zsh-b78caa8ec49317e7d42c8c0b0b71ae196f253524.zip
24703: Src/Zle/zle_main.c: clear trashedzle when first starting
the editor in zleread(), so that reexpandprompt() from the first zrefresh() won't expand the prompt an extra time.
-rw-r--r--ChangeLog6
-rw-r--r--Src/Zle/zle_main.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c8b152cbc..fb7735a93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-11 Barton E. Schaefer <schaefer@zsh.org>
+
+ * 24703: Src/Zle/zle_main.c: clear trashedzle when first starting
+ the editor in zleread(), so that reexpandprompt() from the first
+ zrefresh() won't expand the prompt an extra time.
+
2008-03-11 Peter Stephenson <pws@csr.com>
* unposted: Src/hist.c: make test in 24699 for the extra
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
index 8df07e7ef..0b109cd19 100644
--- a/Src/Zle/zle_main.c
+++ b/Src/Zle/zle_main.c
@@ -1131,6 +1131,7 @@ zleread(char **lp, char **rp, int flags, int context)
eofsent = 0;
resetneeded = 0;
fetchttyinfo = 0;
+ trashedzle = 0;
raw_lp = lp;
lpromptbuf = promptexpand(lp ? *lp : NULL, 1, NULL, NULL);
pmpt_attr = txtchange;
@@ -1721,7 +1722,8 @@ resetprompt(UNUSED(char **args))
/**/
mod_export void
zle_resetprompt(void)
-{ reexpandprompt();
+{
+ reexpandprompt();
if (zleactive)
redisplay(NULL);
}