diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2007-10-22 10:22:16 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2007-10-22 10:22:16 +0000 |
| commit | 6567e77a4e474d9fcc90aeaf645598a79462f3c1 (patch) | |
| tree | 705323908ffee8cc22cfba297c7a4db368a53440 /Src/utils.c | |
| parent | 756cfc08e22119925431acc1cc66602acce42632 (diff) | |
| download | zsh-6567e77a4e474d9fcc90aeaf645598a79462f3c1.tar.gz zsh-6567e77a4e474d9fcc90aeaf645598a79462f3c1.zip | |
24007: prompt allocation and use of "shout"
Diffstat (limited to 'Src/utils.c')
| -rw-r--r-- | Src/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Src/utils.c b/Src/utils.c index bc04c3ec6..d01ec8634 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -1160,7 +1160,7 @@ preprompt(void) int period = getiparam("PERIOD"); int mailcheck = getiparam("MAILCHECK"); - if (isset(PROMPTSP) && isset(PROMPTCR) && !use_exit_printed) { + if (isset(PROMPTSP) && isset(PROMPTCR) && !use_exit_printed && shout) { /* 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). @@ -1284,7 +1284,7 @@ checkmailpath(char **s) checkmailpath(arr); popheap(); } - } else { + } else if (shout) { if (st.st_size && st.st_atime <= st.st_mtime && st.st_mtime > lastmailcheck) { if (!u) { @@ -2302,7 +2302,7 @@ spckword(char **s, int hist, int cmd, int ask) if (ask) { if (noquery(0)) { x = 'n'; - } else { + } else if (shout) { char *pptbuf; pptbuf = promptexpand(sprompt, 0, best, guess); zputs(pptbuf, shout); |