From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Recursive Fload and eval-after-load forms. (See bug #43116.) Date: Tue, 01 Sep 2020 19:42:33 -0400 Message-ID: References: <20200831184526.GB4176@ACM> <20200831194238.GC4176@ACM> <20200901194255.GB12507@ACM> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="16953"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Nonax , emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Sep 02 01:43:52 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kDFwO-0004JU-8u for ged-emacs-devel@m.gmane-mx.org; Wed, 02 Sep 2020 01:43:52 +0200 Original-Received: from localhost ([::1]:52782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDFwN-0000bD-73 for ged-emacs-devel@m.gmane-mx.org; Tue, 01 Sep 2020 19:43:51 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDFvF-00008d-Bl for emacs-devel@gnu.org; Tue, 01 Sep 2020 19:42:41 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:52141) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDFvC-0000wx-3P for emacs-devel@gnu.org; Tue, 01 Sep 2020 19:42:40 -0400 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 1ABA280922; Tue, 1 Sep 2020 19:42:36 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 6F0808066B; Tue, 1 Sep 2020 19:42:34 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1599003754; bh=koGGamtyrQQGKkaP2TGq07sjKg1XWOZZwEyTIZP0JXQ=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=KIUbJC+p8G7Y3bQTB0Rdip/ZmDUzlLdcmDqedncWHUTlUMaXhO9knKul/ib93WRFe /FFMpMuld+/5+kyGO7hatqqm2Z4gfWLdTpihHaIBmny+wYgbwMCAYC53I8i9x9icGi haM3QkaUH20xHTWnImRAGtpmxbPXAHQIuL8y8dKPcM5wB5c49vfVsNUV/qRf415qAC BWHz7R6p1sa/HvX6BRVU6iREMkCbek284HmXe23Xi6oslyEyS+jprVmjTMZpZrQBVO DuYHNlXLviGOUpfYCx+XCAkdjnlK6pFiZb48gr187OBeInv75UoYmI6F9cgE0eDdOW eSNkhE/fP/1kQ== Original-Received: from alfajor (unknown [45.72.232.131]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 3DC7112064D; Tue, 1 Sep 2020 19:42:34 -0400 (EDT) In-Reply-To: <20200901194255.GB12507@ACM> (Alan Mackenzie's message of "Tue, 1 Sep 2020 19:42:55 +0000") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 19:42:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:254478 Archived-At: > - (cond ((symbolp load) (ignore-errors (require load))) > + (cond ((being-loaded-p load)) ; For bug #43116 > + ((symbolp load) (ignore-errors (require load))) Maybe a simpler test that doesn't require a new ad-hoc primitive is to test whether that group has already been defined? Stefan diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 466727630f..8f1e5968b5 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -4844,7 +4844,8 @@ custom-menu-create (if (and (or (not (boundp 'custom-menu-nesting)) (>= custom-menu-nesting 0)) (progn - (custom-load-symbol symbol) + (unless (get symbol 'group-documentation) + (custom-load-symbol symbol)) (< (length (get symbol 'custom-group)) widget-menu-max-size))) (let ((custom-prefix-list (custom-prefix-add symbol custom-prefix-list))