From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.devel Subject: Re: master 5fe9375 2/3: Merge from origin/emacs-26 Date: Tue, 14 May 2019 23:02:32 -0400 Message-ID: References: <20190515001827.19811.454@vcs0.savannah.gnu.org> <20190515001830.743C9206A2@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="125842"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Stefan Monnier , Emacs developers To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 15 05:03:30 2019 Return-path: 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 ) id 1hQkCX-000WcG-ON for ged-emacs-devel@m.gmane.org; Wed, 15 May 2019 05:03:29 +0200 Original-Received: from localhost ([127.0.0.1]:58166 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQkCV-0003fR-M1 for ged-emacs-devel@m.gmane.org; Tue, 14 May 2019 23:03:27 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:43900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQkBu-0003fM-Ad for emacs-devel@gnu.org; Tue, 14 May 2019 23:02:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQkBt-00049E-AR for emacs-devel@gnu.org; Tue, 14 May 2019 23:02:50 -0400 Original-Received: from mail-ot1-x329.google.com ([2607:f8b0:4864:20::329]:40232) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hQkBr-0003mo-FT; Tue, 14 May 2019 23:02:47 -0400 Original-Received: by mail-ot1-x329.google.com with SMTP id u11so879679otq.7; Tue, 14 May 2019 20:02:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Q3VJMQmmODeAJ0mePPF3ReHgzwyGSXYT5jkskI9aiNk=; b=QpQ2Av/GEz+v890rNonBwXAYIiMcUr8JhDL4FtWLR9xL5+VNk/m9E2TlVNYHfAF5mH xcn7U+N0ZJ7nexCNpRXE77aym7M7GzXh3swvz/k35b9ro7+tDbbTqn07SDNKVK4Qzuc3 W/013n/M+Pr2G5/9puej/5p4XLjsGjqWoM0OhV1/uDWLewqw4aKtGwyTcd48cv78UpfB 9roBuLwvtaSUqd+qsaLnhyo6VEDFDQy4JbSwYzz9+J2Mk5cdFjBKVUbz2jypGLKijL+j vp5d3UtF7jPnxo1ianJxsW++9HVpmzRdY3K6A13rFd6e9ZxgGCwPulc10ZHNqijJSevJ qrfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Q3VJMQmmODeAJ0mePPF3ReHgzwyGSXYT5jkskI9aiNk=; b=tJ03BJKyfVFJ9faM77LYhIEwJYyqvKHMvEZNYsTqY+bB8/eO+CT/+9i4OcEB+Yz/NP sF2PSOj7JEdLKsFeQ2wAoBdlxwIk7feFDGhEbH7xXP8L+JnaeOy9lIDfY0yvasknKBhT K0FkHfO15xcgpemeC+5Vid6gLuY0wbSRG5FRIfbrUCTzfA1iajYmTeGRfQLNZ3R3f/4n FBhp/DQ1H/ITDX+oortqWwYP07GpavyCVaVrpkM9ialI0VriPtvnQf1I6sTxrZC+iEIN bhWnKUtdTIEQe6Rbs37vzeY3OqcSQMy1zkoOERqmIkbOb71xAv4EiQO7CGF582kq+Fbc R+ig== X-Gm-Message-State: APjAAAVDTcY9m0AI6kfyPpL0Ded2GJ57tIoLXoeo4O4Qq7TgyVMI45oV 16KsRolkEVESfEU67WCr9dIGqHyZVby/mYMeTdxepwhP X-Google-Smtp-Source: APXvYqwz3yQX9MjbAFCaTIH/dsZuHi3qaSwpeJ/mKNPcnfwk90JiHJjAMzz9QGRizcTur3W7bxClXALG+XBUfd8SRlo= X-Received: by 2002:a9d:60b:: with SMTP id 11mr8797572otn.9.1557889363503; Tue, 14 May 2019 20:02:43 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::329 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:236532 Archived-At: On Tue, 14 May 2019 at 20:38, Glenn Morris wrote: > > branch: master > > commit 5fe9375a5164960c3ecb65a7ef6d742069b8a7d7 > > Merge: 0f63e17 02bee78 > > > # Conflicts: > > # lisp/textmodes/sgml-mode.el > > Please could you check the resolution of this conflict? Yeah, it's fine, [1: e99a124110] in master just happened to remove a :group nearby [2: 7dab3ee7ab]'s changes in emacs-26, but the changes are actually entirely separated. [1: e99a124110]: 2019-01-17 18:25:00 -0500 * lisp/textmodes/sgml-mode.el: Try and fix bug#33887. https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=e99a1241108433a63879a2430d55f2a1910d3c89 [2: 7dab3ee7ab]: 2019-05-09 06:42:40 -0400 Recognize single quote attribute values in nxml and sgml (Bug#35381) https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=7dab3ee7ab54b3c2e7bc24170376054786c01d6f