From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ivan Kanis Newsgroups: gmane.emacs.devel Subject: Re: Source file not shown in help next to symbol Date: Sat, 08 Aug 2015 11:27:44 +0200 Message-ID: <874mkam8of.fsf@kanis.fr> References: <87egkaojsr.fsf@kanis.fr> <87vbdke221.fsf@kanis.fr> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1439026103 18366 80.91.229.3 (8 Aug 2015 09:28:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 8 Aug 2015 09:28:23 +0000 (UTC) Cc: Emacs Development List To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Aug 08 11:28:02 2015 Return-path: Envelope-to: ged-emacs-devel@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 1ZO0Q4-0003Qd-Dn for ged-emacs-devel@m.gmane.org; Sat, 08 Aug 2015 11:28:00 +0200 Original-Received: from localhost ([::1]:52379 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZO0Q3-0004Ms-M4 for ged-emacs-devel@m.gmane.org; Sat, 08 Aug 2015 05:27:59 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZO0Q0-0004Lx-LH for emacs-devel@gnu.org; Sat, 08 Aug 2015 05:27:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZO0Px-0004oP-Dh for emacs-devel@gnu.org; Sat, 08 Aug 2015 05:27:56 -0400 Original-Received: from kanis.fr ([46.19.35.252]:37092 helo=srv2.kanis.fr) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZO0Px-0004mM-1I for emacs-devel@gnu.org; Sat, 08 Aug 2015 05:27:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kanis.fr; s=alpha; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:References:Subject:Cc:To:From; bh=5raDobVb9Z2dirJ9znEVx2FgASdqGnzs7f14az9+HGg=; b=PV3/d5dr6UhJQOimjIRfBrj7Nyziaj9D+Llb7h5W7FXPT/c5Al8ZSLHofcXN1+2w/gNO9sdQ7V/B8IVymYHs5nOpET3OpdhrWCwvvNaofhOD8MykQjJ5KDu2fd0RHzKR; Original-Received: from smtp.comencini.fr ([164.138.25.8]) by smtp.comencini.fr with esmtpsa (TLS1.1:RSA_AES_128_CBC_SHA1:128) (Exim 4.80.1) (envelope-from ) id 1ZO0Pq-0002Xw-KR; Sat, 08 Aug 2015 11:27:46 +0200 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAAXNSR0IArs4c6QAAAB5QTFRF IBkXUxMTOCwoTC4qcUY8iFxQmmper31txpaJ/v/8aKZ1oAAAAcVJREFUOMt100tu2zAQAFDCXnUZ oAcIqG68LZULVLQBbwuSiffm6AIRRyeotAySJoVu2+FPpJWWC3/4NKOZocSW/yxWfnJ2+Bdwzhj7 8gleWVy7DXC2rkMNr2V/zRbghXIwthf3VbIA9Ffc71vZCSFyCEsBggtNS8ludwvfmhYA0Vn9o4DP zMWxR7+cPWzAYFzwM0ModtdmcDbDS6i/hT7L+RZof5yCXGrYe5jn2YO6BYMjgY+51tCIAqHgBLwR pwLnGuRjAKyBJkuN4yd4U92uCY1vUr2D/c5b8DuxyQwfOHUeaLqDJhnkkuGXbB56h2C1IVBdgncc bBi6feroa9B6jUDojnQPQKupbyXyeeCE1oT7Oqrt+SnfY3mkiyGA/3AmD3H5g32CcBx6hY8pRkwJ 9PpcjRGobUfprFnhAa1vepwcgMOhwG+pdSgKHFU9HAvoAH6XUl7lDUCCq5Qb6GMbVm3Aj++qDYCt wdBc/YHgOFCmS3mjDMRcSE2qY4E3Q3PVIQRQmeodNH4QEbRUFZzW+VotzwX4yTcRTySOML1qjcE5 hTirVqDHkMAP0PjAywp3d18JZtqzvr9zDYD+GaSKtE6Zlr/DLPNFmOcvBAAAAABJRU5ErkJggg== X-Hashcash: 1:20:150808:emacs-devel@gnu.org::u87wSu3/fvEl7a7i:0000000000000000000000000000000000000000000MHE X-Hashcash: 1:20:150808:monnier@iro.umontreal.ca::q90wwx0jqYiXAkO0:00000000000000000000000000000000000006+nT In-Reply-To: (Stefan Monnier's message of "Thu, 06 Aug 2015 18:40:49 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 46.19.35.252 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:188602 Archived-At: August, 06 at 18:40 Stefan wrote: >> I got the bug by copying the form that computed the elc-file in the >> original code. I put t instead and it works fine. > > Sorry, got side tracked by vacation and am a bit lost. Can you send the > final patch you think should be applied? Hi Stefan, I have this patch running for a while and it seems fine. I made the commit message today. I can push it if you think it's OK. commit 3a4acdc5d99843ac883831e40cb1d8020df53d69 Author: Ivan Kanis Date: Tue Jul 14 17:04:11 2015 +0200 fix link to source code in help window * lisp/help-fns.el (find-lisp-object-file-name): remove code that will never work due to Glenn Morris change a6d63d9 on Apr 20 2013 'No longer include timestamp in header of .elc files'. Add code that will return .el source file in load-path. diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 1c7a68a..0836c7f 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -275,19 +275,7 @@ suitable file is found, return nil." lib-name) file-name)) ;; The next three forms are from `find-source-lisp-file'. - (elc-file (locate-file - (concat file-name - (if (string-match "\\.el\\'" file-name) - "c" - ".elc")) - load-path nil 'readable)) - (str (when elc-file - (with-temp-buffer - (insert-file-contents-literally elc-file nil 0 256) - (buffer-string)))) - (src-file (and str - (string-match ";;; from file \\(.*\\.el\\)" str) - (match-string 1 str)))) + (src-file (locate-library file-name t nil 'readable))) (and src-file (file-readable-p src-file) src-file)))))) (defun help-fns--key-bindings (function) -- Our whole economy is base on planned obsolescence. -- Brooks Stevens