From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Felipe Ochoa Newsgroups: gmane.emacs.bugs Subject: bug#30888: Allow searching compressed C sources for `find-function' Date: Tue, 20 Mar 2018 16:40:50 -0500 Message-ID: <878tams9wd.fsf@inc-query.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1521582010 24844 195.159.176.226 (20 Mar 2018 21:40:10 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 20 Mar 2018 21:40:10 +0000 (UTC) To: 30888@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Mar 20 22:40:06 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 1eyOzE-0006LX-G1 for geb-bug-gnu-emacs@m.gmane.org; Tue, 20 Mar 2018 22:40:04 +0100 Original-Received: from localhost ([::1]:51843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyP1H-0002vX-Qf for geb-bug-gnu-emacs@m.gmane.org; Tue, 20 Mar 2018 17:42:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyP1B-0002vG-9G for bug-gnu-emacs@gnu.org; Tue, 20 Mar 2018 17:42:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eyP18-0001SU-6M for bug-gnu-emacs@gnu.org; Tue, 20 Mar 2018 17:42:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:36426) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eyP18-0001RX-20 for bug-gnu-emacs@gnu.org; Tue, 20 Mar 2018 17:42:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eyP17-0007Eg-Ow for bug-gnu-emacs@gnu.org; Tue, 20 Mar 2018 17:42:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Felipe Ochoa Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 20 Mar 2018 21:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 30888 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.152158206727739 (code B ref -1); Tue, 20 Mar 2018 21:42:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 20 Mar 2018 21:41:07 +0000 Original-Received: from localhost ([127.0.0.1]:44323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eyP0F-0007DL-1o for submit@debbugs.gnu.org; Tue, 20 Mar 2018 17:41:07 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:39038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eyP0C-0007Ci-SE for submit@debbugs.gnu.org; Tue, 20 Mar 2018 17:41:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eyP06-0000WA-J5 for submit@debbugs.gnu.org; Tue, 20 Mar 2018 17:40:59 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:35219) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eyP06-0000W3-FM for submit@debbugs.gnu.org; Tue, 20 Mar 2018 17:40:58 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyP05-0002oW-B6 for bug-gnu-emacs@gnu.org; Tue, 20 Mar 2018 17:40:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eyP02-0000Qt-8u for bug-gnu-emacs@gnu.org; Tue, 20 Mar 2018 17:40:57 -0400 Original-Received: from mail-vk0-x234.google.com ([2607:f8b0:400c:c05::234]:46515) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eyP02-0000QK-3p for bug-gnu-emacs@gnu.org; Tue, 20 Mar 2018 17:40:54 -0400 Original-Received: by mail-vk0-x234.google.com with SMTP id f124so1891272vkg.13 for ; Tue, 20 Mar 2018 14:40:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=AwqeezX/B9p6dX4eEirWrRqwGoIhtiEt/Bwr3UBGWfg=; b=nSEo+wC5t5e3bkEsiPMeDOnMWNNSYKd26NNFpa71LKP+LiOO8gQiUCUbaJGqGmdHPA CPa7izwqEoX5iqAF5qbfgp15TRuntmsvAtD2UGmfY80ohfEU9neihQ4eVfTO7RBO4lJ1 Xc+YJhy5dPyJsscVet0UpT3lCnJrtSVKPVaO6B62G4Vg9N2e1lz8ehkquyG2bJW7bFwQ qS7lJQ1hnhKlc8t8gfJ9oRWn9y4Nr3QvNaEqFbiyOuWeEPRlgNfUQ0KcT2RYyoNG8JRE D+tu2qVhV2zh9l2WGq2EiQuGW8cEkHH0Sy+Jvxg8bSS86Znc2SCUi0S3uQexqrxWjo8H WGPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=AwqeezX/B9p6dX4eEirWrRqwGoIhtiEt/Bwr3UBGWfg=; b=nOlElFYeb9g05p7GPtgwMaQomhAEZQQQN2aXU4GPR46hsP7lfl901w6lF1NNjKLBHX fzIDaKLXLMvPPBlESoa56kWIhOcj9CDBV+CR6rgt6asPz1OqXjOOQkD72uzxW6/Des7M 079k4MycP7FrePK68n3s0e7a/ihTpvEuccbONBfStBIKsBbv2Jd5wuET5G26o11oxS6m YtgLKoTzWnB1UErTVHyuBAMUesmT0OuCN+hJUGpKOz956Ul9PMfb0ngkHLIHiQ/8DeqF 7ugUgsCratVu6DhU1HO89GCeXw7D6vNcNFxTN08vCD26QgisYjbxFUymS81ofn1+3t/N nOBA== X-Gm-Message-State: AElRT7HU+BQRsww8DKZy3IltHNDpKavL9eHLtmFvu3oEuO86Mi/zpb2Y JhKLnb7R8dIxWfttIvbC28FPKU1w X-Google-Smtp-Source: AG47ELtmG0tKc/Q73rUkqOYzWUf+Hy9VsMxBAi/pcwX/CF7DJHLmHWeQDDsfaZbebR5uUfL/uSBRmQ== X-Received: by 10.31.83.197 with SMTP id h188mr11575019vkb.84.1521582053128; Tue, 20 Mar 2018 14:40:53 -0700 (PDT) Original-Received: from x1-ubuntu ([190.146.241.123]) by smtp.gmail.com with ESMTPSA id d130sm807646vkf.22.2018.03.20.14.40.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 14:40:52 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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:144470 Archived-At: This patch makes the handling of compressed sources consistent between C functions and lisp functions (for which `find-function' already supports compression). >From 3fd28dd1682f9e7a723cc7cbaeaad10da63989cd Mon Sep 17 00:00:00 2001 From: Felipe Ochoa Date: Tue, 20 Mar 2018 16:26:25 -0500 Subject: [PATCH] Allow searching compressed C sources for `find-function' From: felipe * emacs-lisp/find-func.el (find-function-C-source) --- lisp/emacs-lisp/find-func.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index 300bfab..cc1af01 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -243,14 +243,14 @@ find-function-advised-original (defun find-function-C-source (fun-or-var file type) "Find the source location where FUN-OR-VAR is defined in FILE. TYPE should be nil to find a function, or `defvar' to find a variable." - (let ((dir (or find-function-C-source-directory - (read-directory-name "Emacs C source dir: " nil nil t)))) - (setq file (expand-file-name file dir)) - (if (file-readable-p file) + (let* ((dir (or find-function-C-source-directory + (read-directory-name "Emacs C source dir: " nil nil t))) + (full-name (locate-file file (list dir) load-file-rep-suffixes))) + (if full-name (if (null find-function-C-source-directory) (setq find-function-C-source-directory dir)) - (error "The C source file %s is not available" - (file-name-nondirectory file)))) + (error "The C source file %s is not available" file)) + (setq file full-name)) (unless type ;; Either or both an alias and its target might be advised. (setq fun-or-var (find-function-advised-original -- 2.7.4