Prompt oddity when running as "sh" (4.3.0-dev)

Prompt oddity when running as "sh" (4.3.0-dev)

[Bart Schaefer]

schaefer[541] ARGV0=sh Src/zsh -f
%B%S#%s%b
$ 

It would appear that the end-of-line marker for promptcr needs to be
handled differently when running as "sh".

Re: Prompt oddity when running as "sh" (4.3.0-dev)

[Wayne Davison]

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

On Tue, Sep 20, 2005 at 04:00:50PM +0000, Bart Schaefer wrote:
> It would appear that the end-of-line marker for promptcr needs to be
> handled differently when running as "sh".

The attached patch makes sure that PROMPT_PERCENT is enabled when the
PROMPT_SP code wants to expand its end-of-line string.

I also wonder if we want PROMPT_SP (and even PROMPT_CR) set when running
as "sh".  They are both currently enabled by default in all modes.

..wayne..

[-- Attachment #2: promptsp.patch --]
[-- Type: text/plain, Size: 642 bytes --]

--- Src/utils.c	20 Sep 2005 15:41:23 -0000	1.93
+++ Src/utils.c	20 Sep 2005 16:24:38 -0000
@@ -758,7 +758,11 @@ preprompt(void)
 	/* 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). */
-	char *str = promptexpand("%B%S#%s%b", 0, NULL, NULL);
+	char *str;
+	int percents = isset(PROMPTPERCENT);
+	opts[PROMPTPERCENT] = 1;
+	str = promptexpand("%B%S#%s%b", 0, NULL, NULL);
+	opts[PROMPTPERCENT] = percents;
 	fprintf(shout, "%s%*s\r", str, (int)columns - 1 - !hasxn, "");
 	free(str);
     }

Re: Prompt oddity when running as "sh" (4.3.0-dev)

[Bart Schaefer]

On Sep 20,  9:30am, Wayne Davison wrote:
}
} The attached patch makes sure that PROMPT_PERCENT is enabled when the
} PROMPT_SP code wants to expand its end-of-line string.

[...]

} +	str = promptexpand("%B%S#%s%b", 0, NULL, NULL);

Shouldn't that be "%B%S%#%s%b" ?  (That was my original suggestion, in
any event.)            ^^

} I also wonder if we want PROMPT_SP (and even PROMPT_CR) set when running
} as "sh".  They are both currently enabled by default in all modes.

I'd be OK with disabling them in "sh" emulation, but let's hear some more
opinions.

Re: Prompt oddity when running as "sh" (4.3.0-dev)

[Wayne Davison]

On Wed, Sep 21, 2005 at 02:11:10AM +0000, Bart Schaefer wrote:
> Shouldn't that be "%B%S%#%s%b" ?  (That was my original suggestion, in
> any event.)            ^^

I'm not sure why we'd want the character to change between % and #
depending on the user being root.  What was your reasoning?

..wayne..

Re: Prompt oddity when running as "sh" (4.3.0-dev)

[Bart Schaefer]

On Sep 20,  8:42pm, Wayne Davison wrote:
} Subject: Re: Prompt oddity when running as "sh" (4.3.0-dev)
}
} On Wed, Sep 21, 2005 at 02:11:10AM +0000, Bart Schaefer wrote:
} > Shouldn't that be "%B%S%#%s%b" ?
} 
} I'm not sure why we'd want the character to change between % and #
} depending on the user being root.  What was your reasoning?

That it would be the default prompt character, as if zsh had printed
a prompt at the end of the "partial" line and then printed a newline
and a new prompt.