From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#31792: 27.0.50; Regression in #'labels, recent versions Date: Wed, 13 Jun 2018 09:16:01 -0400 Message-ID: References: <5b1f.0188.5dc11.f21c@parhasard.net> <878t7kzyqs.fsf@gmail.com> <87k1r3y5m2.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1528896008 28090 195.159.176.226 (13 Jun 2018 13:20:08 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 13 Jun 2018 13:20:08 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: Aidan Kehoe , 31792@debbugs.gnu.org To: Noam Postavsky Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jun 13 15:20:03 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fT5gx-0007Ds-HR for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 Jun 2018 15:20:03 +0200 Original-Received: from localhost ([::1]:34273 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fT5j4-0007TS-LQ for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 Jun 2018 09:22:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fT5e6-0003Yg-VJ for bug-gnu-emacs@gnu.org; Wed, 13 Jun 2018 09:17:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fT5e3-0007nu-4l for bug-gnu-emacs@gnu.org; Wed, 13 Jun 2018 09:17:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:37964) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fT5e3-0007mU-0U for bug-gnu-emacs@gnu.org; Wed, 13 Jun 2018 09:17:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fT5e2-00055w-54 for bug-gnu-emacs@gnu.org; Wed, 13 Jun 2018 09:17:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 13 Jun 2018 13:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31792 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 31792-submit@debbugs.gnu.org id=B31792.152889576519515 (code B ref 31792); Wed, 13 Jun 2018 13:17:02 +0000 Original-Received: (at 31792) by debbugs.gnu.org; 13 Jun 2018 13:16:05 +0000 Original-Received: from localhost ([127.0.0.1]:45861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fT5d7-00054h-9l for submit@debbugs.gnu.org; Wed, 13 Jun 2018 09:16:05 -0400 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:50106) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fT5d4-00054Y-Q2 for 31792@debbugs.gnu.org; Wed, 13 Jun 2018 09:16:04 -0400 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id w5DDG1OH021207; Wed, 13 Jun 2018 09:16:01 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 12EFA655DC; Wed, 13 Jun 2018 09:16:01 -0400 (EDT) In-Reply-To: <87k1r3y5m2.fsf@gmail.com> (Noam Postavsky's message of "Tue, 12 Jun 2018 18:58:29 -0400") X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 2 Rules triggered EDT_SA_DN_PASS=0, RV6307=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6307> : inlines <6692> : streams <1789565> : uri <2657488> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:147366 Archived-At: > diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el > index d53c8e0bbc..85deb8cb4f 100644 > --- a/lisp/emacs-lisp/cl.el > +++ b/lisp/emacs-lisp/cl.el > @@ -466,8 +466,9 @@ labels > (push var sets) > (push (cons (car binding) > `(lambda (&rest cl-labels-args) > - (cl-list* 'funcall ',var > - cl-labels-args))) > + (if (eq (car cl-labels-args) cl--labels-magic) > + (list cl--labels-magic ',var) > + (cl-list* 'funcall ',var cl-labels-args)))) > newenv))) > (macroexpand-all `(lexical-let ,vars (setq ,@sets) ,@body) newenv))) Looks good, but please add a comment before the call to macroexpand-all reminding that lexical-let installs a macroexpander for `function` that ends up calling cl--labels-convert. Stefan