Re: [PATCH v3 3/6] --color-words: Fix showing trailing deleted words at another line

From

Johannes Schindelin <johannes.schindelin@gmx.de>

Date

May 4, 2008, 09:52 UTC

Message-ID

<alpine.DEB.1.00.0805041049150.30431@racer>

In-Reply-To

<1209874815-14411-4-git-send-email-pkufranky@gmail.com>

Hi,

On Sun, 4 May 2008, Ping Yin wrote:

> With --color-words, following example will show deleted word "bar" at
> another line.

"will", or "used to"?

> This is caused by the unsymmetrical handling of LF in the plus and minus 
> buffer in fn_out_diff_words_aux.

> Following is original unsymmetrical handling rules where LF represents
> a LF will be shown there.

I cannot parse this sentence.

> The second rule causes any word following the trailing plus word will
> be shown in a different line.

I cannot parse this sentence.

> @@ -417,10 +418,11 @@ static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
>  	dwb_plus = &(diff_words->plus);
>  	outfile = diff_words->file;
>  
> -	if (dwp_minus->suppressed_newline) {
> -		if (line[0] != '+')
> -			putc('\n', outfile);
> -		dwp_minus->suppressed_newline = 0;
> +	if ((dwb_minus->suppressed_newline && line[0] != '+') ||