From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail
From: Glenn Morris <rgm@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: master 5fe9375 2/3: Merge from origin/emacs-26
Date: Wed, 15 May 2019 16:39:41 -0400
Message-ID: <tc5zqbbgfm.fsf@fencepost.gnu.org>
References: <20190515001827.19811.454@vcs0.savannah.gnu.org>
	<20190515001830.743C9206A2@vcs0.savannah.gnu.org>
	<xl7eas7dsn.fsf@fencepost.gnu.org>
	<CAM-tV-8PscJtHvkn54Y4-fGb1mXsAzjsMEAY+vR8TWYba6mtxg@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain
Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226";
	logging-data="108758"; mail-complaints-to="usenet@blaine.gmane.org"
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
Cc: Stefan Monnier <monnier@iro.umontreal.ca>,
	Emacs developers <emacs-devel@gnu.org>
To: Noam Postavsky <npostavs@gmail.com>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 15 22:40:17 2019
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane.org
Original-Received: from lists.gnu.org ([209.51.188.17])
	by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256)
	(Exim 4.89)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1hR0hF-000SBt-5K
	for ged-emacs-devel@m.gmane.org; Wed, 15 May 2019 22:40:17 +0200
Original-Received: from localhost ([127.0.0.1]:42182 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1hR0hE-0001v7-74
	for ged-emacs-devel@m.gmane.org; Wed, 15 May 2019 16:40:16 -0400
Original-Received: from eggs.gnu.org ([209.51.188.92]:49545)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1hR0gh-0001v0-ID
	for emacs-devel@gnu.org; Wed, 15 May 2019 16:39:44 -0400
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:35696)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1hR0gh-0000ko-1E; Wed, 15 May 2019 16:39:43 -0400
Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82)
	(envelope-from <rgm@gnu.org>)
	id 1hR0gf-0003z7-Bm; Wed, 15 May 2019 16:39:41 -0400
X-Spook: Pine Gap quiche Hamas Watergate NSA bluebird SP4 bce
X-Ran: a@'h##)<r&0K["\$9{n~$'DFyv[5PkUvQg<l>[pn]aTz~Rp2Gy*kP>*)1]jFuV(!}-~[p#
X-Hue: blue
X-Attribution: GM
In-Reply-To: <CAM-tV-8PscJtHvkn54Y4-fGb1mXsAzjsMEAY+vR8TWYba6mtxg@mail.gmail.com>
	(Noam Postavsky's message of "Tue, 14 May 2019 23:02:32 -0400")
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel/>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Original-Sender: "Emacs-devel" <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Xref: news.gmane.org gmane.emacs.devel:236552
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/236552>

Noam Postavsky wrote:

> Yeah, it's fine, [1: e99a124110] in master just happened to remove a
> :group nearby 

(Personally I wish Stefan would just remove these :groups en masse
rather than including them with unrelated changes.)

> [2: 7dab3ee7ab]'s changes in emacs-26, but the changes are actually
> entirely separated.

Looks to me like there was a genuine conflict in sgml-syntax-propertize-rules?