summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Src/utils.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b7f1e15c..1b67dccfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-09-25  Barton E. Schaefer  <schaefer@brasslantern.com>
 
+	* 29799: Src/utils.c: swap order of RESET_PROMPT / REFRESH in
+	adjustwinsize() so that the cursor is moved to the start of a
+	multi-line prompt before the prompt is actually displayed.
+
 	* 29769: Src/signals.c: handle thisjob == -1 (no foreground job)
 	when checking for whether a background job is allowed to suspend.
 
@@ -15447,5 +15451,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5473 $
+* $Revision: 1.5474 $
 *****************************************************
diff --git a/Src/utils.c b/Src/utils.c
index c8d021c66..41bf0b149 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -1691,8 +1691,8 @@ adjustwinsize(int from)
 	winchanged =
 #endif /* TIOCGWINSZ */
 	    resetneeded = 1;
-	zleentry(ZLE_CMD_REFRESH);
 	zleentry(ZLE_CMD_RESET_PROMPT);
+	zleentry(ZLE_CMD_REFRESH);
     }
 }