maybe PATCH: 21731 broke handling of prompts with newlines in it

maybe PATCH: 21731 broke handling of prompts with newlines in it

[Stephen Rueger]

Hello!

Disclaimer: I hardly know any C, and this is my first journey into the
Zsh source that didn't end with me giving up totally swamped, please
treat the following accordingly.

The new multibyte aware promptcount seems to have a test backwards that
checks if the special treatment of \n and \t can be skipped because the
shell is in the middle of processing a multibyte character.

This simple patch should solve the problem:

--- Src/prompt.c.old	2005-09-22 02:44:38.000000000 +0200
+++ Src/prompt.c	2005-09-22 02:45:30.000000000 +0200
@@ -859,7 +859,7 @@
 		 * relying on the character set being an extension
 		 * of ASCII so it's safe to test a single byte.
 		 */
-		if (multi) {
+		if (!multi) {
 #endif
 		    if (*str == '\t') {
 			w = (w | 7) + 1;



-- 
Stephen Rüger
stephen.rueger@rechnerpost.org

Re: maybe PATCH: 21731 broke handling of prompts with newlines in it

[Clint Adams]

> -		if (multi) {
> +		if (!multi) {

I'm committing this.  However, the logic to set 'multi' appears to be
lacking.

Re: maybe PATCH: 21731 broke handling of prompts with newlines in it

[Stephen Rueger]

On Wed, Sep 21, 2005 at 09:42:03PM -0400, Clint Adams wrote:
> > -		if (multi) {
> > +		if (!multi) {
> 
> I'm committing this.  However, the logic to set 'multi' appears to be
> lacking.

It's at line 896:

		/* else character is incomplete, keep looking. */
		multi = 1;

-- 
Stephen Rüger
stephen.rueger@rechnerpost.org

Re: maybe PATCH: 21731 broke handling of prompts with newlines in it

[Peter Stephenson]

Stephen Rueger <stephen.rueger@rechnerpost.org> wrote:
> -		if (multi) {
> +		if (!multi) {

Yes, the fix is correct:  I think this happened because I was originally
using a character pointer rather than a flag and the sense was the other
way around.

-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070


**********************************************************************
This email and any files transmitted with it are confidential and
intended solely for the use of the individual or entity to whom they
are addressed. If you have received this email in error please notify
the system manager.

**********************************************************************