Subject: Re: bug#24854: 25.1; indent error with regexp

From: Eli Zaretskii <[email-masked]>
Date: Thu, 17 Nov 2016 05:41:14 +0200

> Cc: [email-masked], [email-masked]
> From: Dmitry Gutov <[email-masked]>
> Date: Thu, 17 Nov 2016 02:07:05 +0200
> 
> On 16.11.2016 18:22, Eli Zaretskii wrote:
> 
> > The patch for js.el is okay for emacs-25, but please install the test
> > addition on master, to avoid problems due to renaming in the test
> > suite.
> 
> Thanks.
> 
> I've pushed the fix to emacs-25, but when trying gitmerge, I'm hitting 
> conflicts in several files:
> 
> doc/emacs/cmdargs.texi
> etc/NEWS
> etc/PROBLEMS
> lisp/auth-source.el
> lisp/net/tramp-sh.el

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.)