bug#18438: 24.4.50; assertion failed in bidi.c

[aidalgol]

On Wed, 01 Oct 2014 05:39:53 +0300, Eli Zaretskii wrote:
> > Date: Wed, 01 Oct 2014 12:06:06 +1300
> > From: aidalgol@amuri.net
> > Cc: Eli Zaretskii <eliz@gnu.org>, Ken Brown <kbrown@cornell.edu>
> >
> > On Tue, 30 Sep 2014 19:27:37 +0300, Eli Zaretskii wrote:
> > >> Date: Tue, 30 Sep 2014 12:09:32 -0400
> > >> From: Ken Brown <kbrown@cornell.edu>
> > >> CC: 18438@debbugs.gnu.org
> > >>
> > >> Wouldn't it make sense for him to first see if your recent fix of
> > >> the
> > >> "Current trunk aborts with MinGW" problem also fixes the present
> > >> bug?
> > >
> > > Could be, yes.  I actually thought about this possibility, but 
> > didn't
> > > mention it because I couldn't come up with a scenario where that 
> > bug
> > > could have triggered such strange problems, and only in bidi.c.  
> > But
> > > it does no harm to try applying that patch first, and only apply 
> > this
> > > one if that doesn't help.
> >
> > And where is this patch?  I don't keep up with the happenings on 
> > trunk.
>
> Sorry, it's here:
>
>   http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00901.html

When I try to apply that to commit 623a1b2, patch says "Reversed (or 
previously applied) patch detected!"  Has this been merged to the 
emacs-24 branch?