From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#60628: 29.0.60; apropos-documentation does not work for preloaded symbols Date: Fri, 13 Jan 2023 15:10:02 -0500 Message-ID: References: <83o7rascqg.fsf@gnu.org> Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35311"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 60628@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jan 13 21:11:14 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1pGQOP-000919-LW for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 13 Jan 2023 21:11:13 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGQOF-00013R-Tc; Fri, 13 Jan 2023 15:11:03 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGQOE-00013B-Q3 for bug-gnu-emacs@gnu.org; Fri, 13 Jan 2023 15:11:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGQOE-0000Ua-Hy for bug-gnu-emacs@gnu.org; Fri, 13 Jan 2023 15:11:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGQOE-0000sl-CH for bug-gnu-emacs@gnu.org; Fri, 13 Jan 2023 15:11:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 13 Jan 2023 20:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60628 X-GNU-PR-Package: emacs X-Debbugs-Original-Cc: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.16736406123321 (code B ref -1); Fri, 13 Jan 2023 20:11:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 13 Jan 2023 20:10:12 +0000 Original-Received: from localhost ([127.0.0.1]:52485 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGQNQ-0000rV-1o for submit@debbugs.gnu.org; Fri, 13 Jan 2023 15:10:12 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:40796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGQNO-0000rL-7f for submit@debbugs.gnu.org; Fri, 13 Jan 2023 15:10:11 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGQNN-0000xj-E0 for bug-gnu-emacs@gnu.org; Fri, 13 Jan 2023 15:10:10 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGQNL-0000E0-CN; Fri, 13 Jan 2023 15:10:09 -0500 Original-Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 2D3EB442967; Fri, 13 Jan 2023 15:10:05 -0500 (EST) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 4452644295E; Fri, 13 Jan 2023 15:10:03 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1673640603; bh=galsRSiziPPv0AeNh2ZI7x8OXbHB0P0HrBA1Ub51cq4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=D9ViySSmZdkua/dv8Y5epZ3w621oMqHSEGNSN8bkxRE1Xmalq4kZHSd96zsDvNulx 41YnMBDyJMZF5+XtL1a/YvFrPvMCY2O6yASHi4ZJD3CosXjNkJPR2he1A4sVvrY0ds GsHq0j71oOP046Id7fCh4T8cRjjzThgLvbONawzTQAW8ITCqdNsvM+GMdG8fi161pg +JmPoX/VkYWG0aIh0jqVq6G4Utb3NNe8lGqWVWISlwg6sa3TiXknSvZL22P3C7PtXq p6Togv1+LFYVHw8iwyIXOJqB+2Wm64fJvfWdvpBKbP6YOs0gnCSZo7rEsOmQK0GaaT 6Oeqe0KGiQMKA== Original-Received: from pastel (unknown [45.72.200.228]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 1E475120E6B; Fri, 13 Jan 2023 15:10:03 -0500 (EST) In-Reply-To: (Stefan Monnier's message of "Fri, 13 Jan 2023 10:46:21 -0500") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca 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: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:253308 Archived-At: > For `emacs-29` the better option is probably to just revert the > above commit. Then again, since \n#@ can also match false positives, we may as well keep the above commit and just search for #@ instead. The patch below should fix both problems in a kind of "minimalist" way (i.e. meant for `emacs-29`). Can someone confirm it also works for them while I clean it up? Stefan diff --git a/lisp/apropos.el b/lisp/apropos.el index b260d889955..b66f27b8a9e 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -913,8 +913,19 @@ (apropos-sort-by-scores apropos-documentation-sort-by-scores) f v sf sv) (apropos-documentation-check-doc-file) - (if do-all - (mapatoms + (funcall + (if do-all #'mapatoms + (lambda (f) + (let ((preloaded-regexp + (concat "\\`" + (regexp-quote lisp-directory) + (regexp-opt preloaded-file-list) + "\\.elc?\\'"))) + (dolist (x load-history) + (when (string-match preloaded-regexp (car x)) + (dolist (def (cdr x)) + (when (eq 'defun (car-safe def)) + (funcall f (cdr def))))))))) (lambda (symbol) (setq f (apropos-safe-documentation symbol) v (get symbol 'variable-documentation)) @@ -939,7 +950,7 @@ (cons (list symbol (+ (apropos-score-symbol symbol 2) sf sv) f v) - apropos-accumulator))))))) + apropos-accumulator)))))) (apropos-print nil "\n----------------\n" nil t)))) @@ -1064,10 +1064,12 @@ (setq apropos-files-scanned (cons file apropos-files-scanned)) (erase-buffer) (insert-file-contents file) - (while (search-forward "\n#@" nil t) + (while (search-forward "#@" nil t) ;; Read the comment length, and advance over it. - (setq end (read) - beg (1+ (point)) + ;; This #@ may be a false positive, so don't get upset if + ;; it's not followed by the expected number of bytes to skip. + (when (and (setq end (ignore-errors (read))) (natnump end)) + (setq beg (1+ (point)) end (+ (point) end -1)) (forward-char) (if (save-restriction @@ -1110,7 +1112,7 @@ 'face apropos-match-face doc))) (setcar (nthcdr (if this-is-a-variable 3 2) apropos-item) - doc)))))))))) + doc)))))))))))