Subject: Re: bug#24854: 25.1; indent error with regexp
From: Dmitry Gutov <[email-masked]>
To: Eli Zaretskii <[email-masked]>
Cc: [email-masked], [email-masked]
Date: Fri, 18 Nov 2016 02:13:16 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Version: 25.2

On 17.11.2016 05:41, Eli Zaretskii wrote:

> You don't have to perform the merge, if you aren't comfortable with
> resolving the conflicts.  Just install the change for the test suite
> on master.  (Yes, it will fail until the js.el fix is merged, but
> that's not a catastrophe.)

Oh, okay, done. Closing the bug.

Everyone who's wondering when this will reach Emacs 26, just wait for 
the merge.