From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.bugs Subject: bug#19704: 25.0.50; funcall with hard-quote inside cl-labels uses the local function binding Date: Thu, 9 Jun 2016 22:37:37 -0400 Message-ID: References: <86twzc8czn.fsf@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1465526308 12073 80.91.229.3 (10 Jun 2016 02:38:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 10 Jun 2016 02:38:28 +0000 (UTC) Cc: Dmitry Gutov To: 19704@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jun 10 04:38:18 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bBCKt-0008GR-P8 for geb-bug-gnu-emacs@m.gmane.org; Fri, 10 Jun 2016 04:38:15 +0200 Original-Received: from localhost ([::1]:38047 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBCKs-0007i7-Ou for geb-bug-gnu-emacs@m.gmane.org; Thu, 09 Jun 2016 22:38:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBCKm-0007bG-UO for bug-gnu-emacs@gnu.org; Thu, 09 Jun 2016 22:38:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bBCKg-0003te-Ux for bug-gnu-emacs@gnu.org; Thu, 09 Jun 2016 22:38:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:50933) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBCKg-0003tG-Rd for bug-gnu-emacs@gnu.org; Thu, 09 Jun 2016 22:38:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bBCKg-0001he-Gw for bug-gnu-emacs@gnu.org; Thu, 09 Jun 2016 22:38:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <86twzc8czn.fsf@yandex.ru> Resent-From: Noam Postavsky Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 10 Jun 2016 02:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19704 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 19704-submit@debbugs.gnu.org id=B19704.14655262666518 (code B ref 19704); Fri, 10 Jun 2016 02:38:02 +0000 Original-Received: (at 19704) by debbugs.gnu.org; 10 Jun 2016 02:37:46 +0000 Original-Received: from localhost ([127.0.0.1]:35035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bBCKP-0001h3-UE for submit@debbugs.gnu.org; Thu, 09 Jun 2016 22:37:46 -0400 Original-Received: from mail-oi0-f66.google.com ([209.85.218.66]:32923) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bBCKN-0001gk-QB for 19704@debbugs.gnu.org; Thu, 09 Jun 2016 22:37:44 -0400 Original-Received: by mail-oi0-f66.google.com with SMTP id e205so5513406oig.0 for <19704@debbugs.gnu.org>; Thu, 09 Jun 2016 19:37:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:from:date:message-id:subject:to:cc; bh=qdJh6vE5UXs5vjxITHAe9x4QJrrjaSxa0pn19PAJCGs=; b=U00f7LpwNKusaL8CnNixqI3s1RSc7Aep2O/NS5llo/Za2s7iWnwVne4npaBZwWeoKm oduqLTlxJjoVmLhRVBInHqqqNUMrbHyw07xuhpjwvy273wHadhMHwzNngjHjCO1XQTSr jlw+Xdt8BV4XU7uiT2P0XjwKtHP/QmJanMMus/mz/C4RsQbGmXm9b/woTEbuTfMkUEkt Z7Qie9ELzZL/X2i5u7B8TaqSgY6Cj5S+r0DWKUKjxeAzL/8i8b0EDu0vvAaTfB2Ubryv w4FqYh75+7EfLjZzF1nWncezEv3rUSqrI42um8+yEXmqff1AB0bp3bdI6mOJ98sa5fVl hMSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to:cc; bh=qdJh6vE5UXs5vjxITHAe9x4QJrrjaSxa0pn19PAJCGs=; b=fongb6CN/HdHJksV+ewcKTzge8B4lKe56yFFZY2OVmoQG86seQivChwpASUgPFBgPn dUhXNjfLNS/Dtfc6fWAoKKkCoO2u72pR23gBITyxj0kbn4k/RTWHIuPRwNMhSfdDitGu V6E7InTh7Z0S9exXm4hg5b/RFntlgLDnqpCS7dLBHw9QigvG3308+RtlXgIUAovPlhuM vLjMwjWQP/oMqO/mlG27buQyoIlyLElUfb+S5pXzpCCxFUu58/idWc/0rxVQ4flFUkB+ KZmg0E+5hGoPj5nPVLjPchEB6qtEhd/WGwzU7znR1M/HR+XVurs4KpVz5pmtbNNs/8y1 CQrw== X-Gm-Message-State: ALyK8tJfYfaq/2ako99UuP8ZHR4YRpzonDKBorq3cQZlnoG7yRXMw8U/xTpZFvDFvLhTQwRDDO++/fMeMk8sUg== X-Received: by 10.202.245.196 with SMTP id t187mr6505731oih.178.1465526258320; Thu, 09 Jun 2016 19:37:38 -0700 (PDT) Original-Received: by 10.157.5.168 with HTTP; Thu, 9 Jun 2016 19:37:37 -0700 (PDT) X-Google-Sender-Auth: FQBlrjYBjGTRCXYYoMmTMlB2Njs 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:119356 Archived-At: tag 19704 + patch found 19704 25.0.94 quit Seems that macroexp--expand-all got too aggressive, patch below teaches it to back off in case of locally defined functions: diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index ed4d6e4..ce5d5dc 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -261,9 +261,14 @@ macroexp--expand-all (format "%s quoted with ' rather than with #'" (list 'lambda (nth 1 f) '...)) (macroexp--expand-all `(,fun ,arg1 ,f . ,args)))) - (`(funcall (,(or 'quote 'function) ,(and f (pred symbolp)) . ,_) . ,args) - ;; Rewrite (funcall #'foo bar) to (foo bar), in case `foo' - ;; has a compiler-macro. + ;; Rewrite (funcall #'foo bar) to (foo bar), in case `foo' + ;; has a compiler-macro. + (`(funcall (,(or 'quote 'function) + ,(and f (pred symbolp) + ;; Unless `foo' is a locally bound macro. + (guard (not (assq f macroexpand-all-environment)))) + . ,_) + . ,args) (macroexp--expand-all `(,f . ,args))) (`(,func . ,_) ;; Macro expand compiler macros. This cannot be delayed to