On Sun, May 4, 2008 at 5:52 PM, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > 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"? should be 'used to' > > This is caused by the unsymmetrical handling of LF in the plus and minus > > buffer in fn_out_diff_words_aux. > > Is it not rather caused by the need to replace non-word-characters with > LF? No, i think this has nothing to do with the replacing non-word-characters with LF. > > > Following is original unsymmetrical handling rules where LF represents > > a LF will be shown there. > > I cannot parse this sentence. Following is the original unsymmetrical handling rules > > > The second rule causes any word following the trailing plus word will > > be shown in a different line. > > I cannot parse this sentence. > > The second rule causes any word following the trailing plus word to show in a different line with the trailing plus word. > > > @@ -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] != '+') || > > If the previous version had dwp_minus, and the new version has dwb_minus, > I wonder if both compile and pass the test suite. > Oh, it's a typo in the former patch. -- Ping Yin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html