about summary refs log tree commit diff
path: root/Src/Zle
diff options
context:
space:
mode:
authorWayne Davison <wayned@users.sourceforge.net>2005-07-26 22:46:10 +0000
committerWayne Davison <wayned@users.sourceforge.net>2005-07-26 22:46:10 +0000
commitd355573c48cdadbfb8c8eba98a97eccabb1dcda1 (patch)
treea7ca9288ac30d73129967e2807886dc40b4f990f /Src/Zle
parentd3e176012d02e994bf3b08544f5a78a8c35899f3 (diff)
downloadzsh-d355573c48cdadbfb8c8eba98a97eccabb1dcda1.tar.gz
zsh-d355573c48cdadbfb8c8eba98a97eccabb1dcda1.tar.xz
zsh-d355573c48cdadbfb8c8eba98a97eccabb1dcda1.zip
Moving the PROMPT_SP code earlier in the scheme of things so that
it can take affect prior to things like the mail-check output.
Diffstat (limited to 'Src/Zle')
-rw-r--r--Src/Zle/zle_main.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
index 33fbf0049..0f9d55226 100644
--- a/Src/Zle/zle_main.c
+++ b/Src/Zle/zle_main.c
@@ -962,30 +962,8 @@ zleread(char **lp, char **rp, int flags, int context)
 	}
     }
     initundo();
-    if (isset(PROMPTCR)) {
-	/* The PROMPT_SP heuristic will move the prompt down to a new line
-	 * if there was any dangling output on the line (assuming the terminal
-	 * has automatic margins, but we try even if hasam isn't set). */
-	if (isset(PROMPTSP)) {
-	    if (hasxn) /* w/o this, a delayed wrap might be lost by TCRIGHT */
-		putc(' ', shout);
-	    if (tccan(TCSAVECURSOR)
-	     && tcmultout(TCRIGHT, TCMULTRIGHT, columns - 3)) {
-		putc(' ', shout);
-		putc(' ', shout);
-		tcout(TCSAVECURSOR);
-		tcout(TCBACKSPACE);
-		tcout(TCBACKSPACE);
-		if (tccan(TCCLEAREOL))
-		    tcout(TCCLEAREOL);
-		else
-		    tcmultout(TCDEL, TCMULTDEL, 1);
-		tcout(TCRESTRCURSOR);
-	    } else
-		fprintf(shout, "%*s", (int)columns - 1, "");
-	}
+    if (isset(PROMPTCR))
 	putc('\r', shout);
-    }
     if (tmout)
 	alarm(tmout);
     zleactive = 1;