From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Troels Nielsen Newsgroups: gmane.emacs.bugs Subject: bug#12371: macroexp--funcall-if-compiled broke bootstrap for me Date: Thu, 20 Sep 2012 10:21:00 +0200 Message-ID: References: <505A6AC1.8060808@cs.ucla.edu> <505AA1F7.904@cs.ucla.edu> <505AA58D.9060808@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 X-Trace: ger.gmane.org 1348129309 1699 80.91.229.3 (20 Sep 2012 08:21:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Sep 2012 08:21:49 +0000 (UTC) Cc: 12371@debbugs.gnu.org To: Paul Eggert Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Sep 20 10:21:53 2012 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 1TEc14-00016G-Gx for geb-bug-gnu-emacs@m.gmane.org; Thu, 20 Sep 2012 10:21:46 +0200 Original-Received: from localhost ([::1]:50888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEc10-0000Ew-2l for geb-bug-gnu-emacs@m.gmane.org; Thu, 20 Sep 2012 04:21:42 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:44868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEc0u-0000De-R1 for bug-gnu-emacs@gnu.org; Thu, 20 Sep 2012 04:21:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TEc0q-0005JL-J6 for bug-gnu-emacs@gnu.org; Thu, 20 Sep 2012 04:21:36 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:34948) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEc0q-0005Ir-FD for bug-gnu-emacs@gnu.org; Thu, 20 Sep 2012 04:21:32 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1TEc2I-0001hg-B4 for bug-gnu-emacs@gnu.org; Thu, 20 Sep 2012 04:23:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Troels Nielsen Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 20 Sep 2012 08:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12371 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 12371-submit@debbugs.gnu.org id=B12371.13481293546516 (code B ref 12371); Thu, 20 Sep 2012 08:23:02 +0000 Original-Received: (at 12371) by debbugs.gnu.org; 20 Sep 2012 08:22:34 +0000 Original-Received: from localhost ([127.0.0.1]:44494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TEc1q-0001h2-7i for submit@debbugs.gnu.org; Thu, 20 Sep 2012 04:22:34 -0400 Original-Received: from mail-lb0-f172.google.com ([209.85.217.172]:45546) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TEc1o-0001gq-5l for 12371@debbugs.gnu.org; Thu, 20 Sep 2012 04:22:32 -0400 Original-Received: by lboj14 with SMTP id j14so1642654lbo.3 for <12371@debbugs.gnu.org>; Thu, 20 Sep 2012 01:21:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=+jRJ93L1Q3DcYhiGBv3PLImSxC7XrYYcEmL9ybbRV34=; b=XKtTKKDtQjCv/RpNZxV8KUeDwhAGUnqQRBXCpC9q+BPsUTm5NtS0z8beF6gmqr7eaX 95vdexJ+ekNR5Stvs/G9r97XPfoM8u2ZprU1olA8GxhGg1OtU89+LWQpta2AuKzdCyTp WaDdUbz2H4MmY5yoBMW9r/F9u3FeiuW6+4fDe2yNcjDz5mHu1Vdo7SOXHno+JHmsnTW1 xSEiur/e17g6t0/H0s7D00Nny28LQxutD3UICRUSihhPM3waeXIrp1IGrG5KVdoKu/Mx jhnH1ZsCgYVE7CFuso07zE3TUWvnj87ElUCOS+6Af48LaiHA9xsha5x+WJl+YYmt17yf Pz4g== Original-Received: by 10.152.103.243 with SMTP id fz19mr400979lab.27.1348129260859; Thu, 20 Sep 2012 01:21:00 -0700 (PDT) Original-Received: by 10.114.25.138 with HTTP; Thu, 20 Sep 2012 01:21:00 -0700 (PDT) In-Reply-To: <505AA58D.9060808@cs.ucla.edu> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:64635 Archived-At: I've run into the same problems this morning, and this patch solves the problems for me: The first one I think just is a line gone missing. The next chunk extracts (car form) before it's to late, as form goes about being changed before the closure is being called. Kind Regards Troels Nielsen === modified file 'lisp/calc/calc.el' --- lisp/calc/calc.el 2012-09-20 03:44:57 +0000 +++ lisp/calc/calc.el 2012-09-20 07:50:18 +0000 @@ -914,9 +914,9 @@ ;; Set up the autoloading linkage. (let ((name (and (fboundp 'calc-dispatch) - (autoloadp (symbol-function 'calc-dispatch)))) + (autoloadp (symbol-function 'calc-dispatch)) + (nth 1 (symbol-function 'calc-dispatch)))) (p load-path)) ;; If Calc files exist on the load-path, we're all set. (while (and p (not (file-exists-p (expand-file-name "calc-misc.elc" (car p))))) === modified file 'lisp/emacs-lisp/macroexp.el' --- lisp/emacs-lisp/macroexp.el 2012-09-20 03:29:41 +0000 +++ lisp/emacs-lisp/macroexp.el 2012-09-20 07:51:54 +0000 @@ -148,10 +148,11 @@ (car-safe form) (symbolp (car form)) (get (car form) 'byte-obsolete-info)) - (macroexp--funcall-and-return - (lambda () (byte-compile-warn-obsolete (car form))) - #'ignore ;FIXME: We should `message' something. - new-form) + (let ((sym (car form))) + (macroexp--funcall-and-return + (lambda () (byte-compile-warn-obsolete sym)) + #'ignore ;FIXME: We should `message' something. + new-form)) new-form))) (pcase form (`(cond . ,clauses)