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: Wed, 15 May 2019 19:06:14 -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="191724"; 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 Thu May 16 01:07:16 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 1hR2zU-000nk0-09 for ged-emacs-devel@m.gmane.org; Thu, 16 May 2019 01:07:16 +0200 Original-Received: from localhost ([127.0.0.1]:45210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR2zS-0001TK-VZ for ged-emacs-devel@m.gmane.org; Wed, 15 May 2019 19:07:15 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:59996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hR2yo-0001T1-Bj for emacs-devel@gnu.org; Wed, 15 May 2019 19:06:35 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hR2yn-0007gB-EC for emacs-devel@gnu.org; Wed, 15 May 2019 19:06:34 -0400 Original-Received: from mail-ot1-x333.google.com ([2607:f8b0:4864:20::333]:41714) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hR2yl-0007eL-Uj; Wed, 15 May 2019 19:06:32 -0400 Original-Received: by mail-ot1-x333.google.com with SMTP id g8so1645521otl.8; Wed, 15 May 2019 16:06:31 -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=ZOscwYf1XwRnUPEAF/77cxiZL6DMcp25pyyFE0Y6ucE=; b=XwmoLkMwjg92lYY9qB96+oeRdxTrzRQLA4Rup9DMPzHoGfuRZJ5FMrW3FPdcvLY3Bg gc/0W+xewAHZiDvBeIbRJkLoLDMuaPFcvI1+FNdybsYRH3QtxeIq52gAiXUdlgmcORI9 XF0yXNIHY9juEeKVS+6zVIWEiFUE69QQT9lJVNFl/aAb0PPSMZL0ZfIGQvjQNyxlv65U /lPLUz0hx9vM7Lzl0zmzX9weGQL1Uzc3Obltu/VbShjRwtjnLu+Hn5Rqt8Rd2SS8oeJr zzn9n1UaGDYS4Da/6uc2ZXfZz3FMJIfBUQ3HhrDw77gCOB6JpgsrxDqOxK406rqgKyIo 86Pg== 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=ZOscwYf1XwRnUPEAF/77cxiZL6DMcp25pyyFE0Y6ucE=; b=AzZhH1YrJoBgfEtoIQQZOqIXdc8TsXnXC91uiqI+5u4FB68NYrNMUi32KNgPn6pvpC RY1Tuaf9jXYLv3mg6c3MfdwYiwa0ATv4+BWzhhNFK7fGjJl+MlHnpGeBEhTRkbPH+NtQ fif14ebe7H5LQfFkI3Waui0InK0jwekKvhVWrdIGMbXEpRoR0/bsU2/ZOiLjSY81cNMR MP03NLhSCvhYJMoKxPsq9S88/nz1p/jg1MSGcfHwNianY/KrkRO3N3+rBxZHOjjy7Qiz h8RuO3uSCxUow9ggFfb4OLLV174p8idBYFX5N1+V1pXx7NmaCdIQWFIuiyItqi0V3qwj yxYg== X-Gm-Message-State: APjAAAUwQ/46xcHS19JJFLhKFGPMGTzGWJrW5mKC3FPABz8jzxikLUua mfw+jP8MYjEztx3DiOIe6/2OQG3db8c8nAOhzqeWCwPj X-Google-Smtp-Source: APXvYqwnD7OfJZp4+ggxwaEG4ju8gjhjXEBbryuzENbaCImAMreuy+CTYnEQYSAJNXx9SZ3YkX8r860LktNgSovgykk= X-Received: by 2002:a9d:60b:: with SMTP id 11mr12722064otn.9.1557961590660; Wed, 15 May 2019 16:06:30 -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::333 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:236559 Archived-At: On Wed, 15 May 2019 at 16:39, Glenn Morris wrote: > Looks to me like there was a genuine conflict in sgml-syntax-propertize-rules? Should be fixed now. [1: e7e92dc5d2]: 2019-05-15 19:04:14 -0400 Fix merge of sgml-syntax-propertize-rules https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=e7e92dc5d24ac3bcde69732bab6a6c3c0d9de97b