From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: master 0bd860cc2e 1/2: Merge from origin/emacs-28
Date: Thu, 01 Sep 2022 09:01:29 +0300
Message-ID: <83a67jskee.fsf@gnu.org>
References: <166200694082.4257.10737304596784164838@vcs2.savannah.gnu.org>
 <20220901043541.C1441C00890@vcs2.savannah.gnu.org>
 <CADwFkm=VRtguXBZDu8rzZZSv3P6Oocsf_PbK6tWmnwsJrEvL1g@mail.gmail.com>
Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214";
	logging-data="26018"; mail-complaints-to="usenet@ciao.gmane.io"
Cc: emacs-devel@gnu.org
To: Stefan Kangas <stefankangas@gmail.com>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Sep 01 08:03:15 2022
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane-mx.org
Original-Received: from lists.gnu.org ([209.51.188.17])
	by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
	(Exim 4.92)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>)
	id 1oTdII-0006aK-Ms
	for ged-emacs-devel@m.gmane-mx.org; Thu, 01 Sep 2022 08:03:14 +0200
Original-Received: from localhost ([::1]:55536 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>)
	id 1oTdIH-0000tr-BK
	for ged-emacs-devel@m.gmane-mx.org; Thu, 01 Sep 2022 02:03:13 -0400
Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59964)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@gnu.org>) id 1oTdGD-0008SR-Bo
 for emacs-devel@gnu.org; Thu, 01 Sep 2022 02:01:05 -0400
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:47736)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@gnu.org>)
 id 1oTdGB-0004Ch-HQ; Thu, 01 Sep 2022 02:01:04 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=eDKdH+dexabnGdA4NeP0A3fRu/tAAgqqBpjxkcnltWg=; b=U4uSjvBs26ba
 05QtSsjK1XMV/gQuuSntQh6BSgrDQcF2DSOzAgtzFs60qj+OE0IS3WTYFkGWgu+r6Kl+dsUX4TzMq
 wALHXBZrUL2JiC+3mUYjEabmBk03IbQqnVDePpnhOvpfzPmr6fgsO8WStFf0QNky23DaBV2q/ZcnS
 83bD7K1I8Key1zQiSXhriFMHQGqDpZwmpMc36gWkIgh5m60JPhGYGnQiNWVmi9Q8O5tWm1T5Q+4TM
 hbERzdInG29emJEmuY6ziWm+e8fxCs8sUiqhBvL819lKJg/xT4MVnkl/biEhtgsEwaqsoY5IqAL8u
 10lbeY63F7M4Tv3i2lQPqw==;
Original-Received: from [87.69.77.57] (port=3735 helo=home-c4e4a596f7)
 by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@gnu.org>)
 id 1oTdGA-0003g3-Vg; Thu, 01 Sep 2022 02:01:03 -0400
In-Reply-To: <CADwFkm=VRtguXBZDu8rzZZSv3P6Oocsf_PbK6tWmnwsJrEvL1g@mail.gmail.com>
 (message from Stefan Kangas on Thu, 1 Sep 2022 07:01:00 +0200)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.29
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: <https://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-mx.org@gnu.org
Original-Sender: "Emacs-devel"
 <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>
Xref: news.gmane.io gmane.emacs.devel:294469
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/294469>

> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Thu, 1 Sep 2022 07:01:00 +0200
> 
> Could someone please double check the hunk above and the changes in
> xdisp.c to see that the merge looks okay?  Feel free to commit any
> fixes directly to master.  Thanks in advance.

I fixed xdisp.c; the rest looks OK.

Thanks.