From: Eli Zaretskii <eliz@gnu.org>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: 24854@debbugs.gnu.org, jamesyang999@gmail.com
Subject: bug#24854: 25.1; indent error with regexp
Date: Thu, 17 Nov 2016 05:41:14 +0200 [thread overview]
Message-ID: <8360nmg4dh.fsf@gnu.org> (raw)
In-Reply-To: <cc1ef5db-ab86-0441-6081-2dcd6712f660@yandex.ru> (message from Dmitry Gutov on Thu, 17 Nov 2016 02:07:05 +0200)
> Cc: 24854@debbugs.gnu.org, jamesyang999@gmail.com
> From: Dmitry Gutov <dgutov@yandex.ru>
> 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.)
next prev parent reply other threads:[~2016-11-17 3:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-01 23:30 bug#24854: 25.1; indent error with regexp James Yang
2016-11-08 10:06 ` Andreas Röhler
2016-11-09 0:35 ` npostavs
2016-11-09 6:37 ` Andreas Röhler
2016-11-15 0:04 ` Dmitry Gutov
2016-11-16 7:45 ` Andreas Röhler
2016-11-16 16:24 ` Eli Zaretskii
2016-11-16 16:39 ` Andreas Röhler
2016-11-16 16:22 ` Eli Zaretskii
2016-11-17 0:07 ` Dmitry Gutov
2016-11-17 3:41 ` Eli Zaretskii [this message]
2016-11-17 11:31 ` Andreas Röhler
2016-11-17 16:08 ` Eli Zaretskii
2016-11-18 0:13 ` Dmitry Gutov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8360nmg4dh.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=24854@debbugs.gnu.org \
--cc=dgutov@yandex.ru \
--cc=jamesyang999@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).