Attachment 697263 Details for Bug 821262 – Proposed patch

[patch] Proposed patch

mb.patch (text/plain), 1.07 KB, created by Roman Kollár on 2013-02-14 15:54:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roman Kollár

Created: 2013-02-14 15:54:55 UTC

Size: 1.07 KB

patch

obsolete

>--- coreutils-8.20/src/unexpand.c	2013-02-14 16:45:25.995676513 +0100
>+++ _coreutils-8.20/src/unexpand.c	2013-02-14 16:34:27.943711862 +0100
>@@ -136,6 +136,7 @@ unexpand_multibyte (void)
>   wint_t wc;			/* A gotten wide character. */
>   size_t mblength;		/* The byte size of a multibyte character
> 				   which shows as same character as WC. */
>+  bool prev_tab = false;
> 
>   /* Index in `tab_list' of next tabstop: */
>   int tab_index = 0;		/* For calculating width of pending tabs. */
>@@ -208,13 +209,14 @@ unexpand_multibyte (void)
> 	    }
> 	  pending += next_tab_column - column;
> 	  column = next_tab_column;
>+      prev_tab = true;
> 	}
>       else
> 	{
> flush_pend_mb:
> 	  /* Flush pending spaces.  Print as many tabs as possible,
> 	     then print the rest as spaces. */
>-	  if (pending == 1)
>+	  if (pending == 1 && column != 1 && !prev_tab)
> 	    {
> 	      putchar (' ');
> 	      pending = 0;
>@@ -315,6 +317,7 @@ flush_pend_mb:
> 	      fwrite (bufpos, sizeof(char), mblength, stdout);
> 	    }
> 	}
>+      prev_tab = wc == L'\t';
>       buflen -= mblength;
>       bufpos += mblength;
>     }

Actions: View | Diff

Attachments on bug 821262: 584161 | 697263