Merge https://github.com/yasm/yasm/commit/ab19547382660d81e0b4a0232dccb38f44c52a36

Merge https://github.com/yasm/yasm/commit/ab19547382660d81e0b4a0232dccb38f44c52a36
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=134927

[scottmg, 2012-05-02 16:35:24]

Additional patch on top of the previous one, required to build non-Administrator
on Windows, it seems.

[Nico, 2012-05-02 16:52:05]

https://chromiumcodereview.appspot.com/10324002/diff/1/tools/re2c/code.c
File tools/re2c/code.c (right):

https://chromiumcodereview.appspot.com/10324002/diff/1/tools/re2c/code.c#newc...
tools/re2c/code.c:31: return NULL;
This indent looks different from the upstream patch. Why is that?

[scottmg, 2012-05-02 16:58:23]

http://chromiumcodereview.appspot.com/10324002/diff/1/tools/re2c/code.c
File tools/re2c/code.c (right):

http://chromiumcodereview.appspot.com/10324002/diff/1/tools/re2c/code.c#newco...
tools/re2c/code.c:31: return NULL;
On 2012/05/02 16:52:05, Nico wrote:
> This indent looks different from the upstream patch. Why is that?

The pretty diff page on github isn't replacing tabs so it's getting collapsed.
If you go to the view file link, it looks the same as here.

[Nico, 2012-05-02 16:58:49]

lgtm

[Nico, 2012-05-02 16:59:32]

Wait, shouldn't rietveld show tabs as tabs though?

[scottmg, 2012-05-02 17:01:11]

On 2012/05/02 16:59:32, Nico wrote:
> Wait, shouldn't rietveld show tabs as tabs though?

Yup, it does. View file on github, and reitveld are both correctly emitting tabs
(and they take up 8 spaces). github diff view (only) is collapsing them.

[Nico, 2012-05-02 17:02:40]

On 2012/05/02 17:01:11, scottmg wrote:
> On 2012/05/02 16:59:32, Nico wrote:
> > Wait, shouldn't rietveld show tabs as tabs though?
> 
> Yup, it does. View file on github, and reitveld are both correctly emitting
tabs
> (and they take up 8 spaces). github diff view (only) is collapsing them.

I meant as red ">>" characters. If you're sure it's a tab locally, go ahead and
commit.

[scottmg, 2012-05-02 17:02:47]

On 2012/05/02 17:01:11, scottmg wrote:
> On 2012/05/02 16:59:32, Nico wrote:
> > Wait, shouldn't rietveld show tabs as tabs though?
> 
> Yup, it does. View file on github, and reitveld are both correctly emitting
tabs
> (and they take up 8 spaces). github diff view (only) is collapsing them.

Oh, actually more complicated than that. The pretty diff
http://chromiumcodereview.appspot.com/10324002/diff/1/tools/re2c/code.c on
reitveld replaces tabs with 8 spaces. The raw diff has a tab:
http://chromiumcodereview.appspot.com/10324002/patch/1/2

[scottmg, 2012-05-02 17:05:24]

On 2012/05/02 17:02:40, Nico wrote:
> On 2012/05/02 17:01:11, scottmg wrote:
> > On 2012/05/02 16:59:32, Nico wrote:
> > > Wait, shouldn't rietveld show tabs as tabs though?
> > 
> > Yup, it does. View file on github, and reitveld are both correctly emitting
> tabs
> > (and they take up 8 spaces). github diff view (only) is collapsing them.
> 
> I meant as red ">>" characters. If you're sure it's a tab locally, go ahead
and
> commit.

Oh, I didn't know reitveld did that, I've never seen those. They are definitely
tabs locally.