From unknown Fri Aug 15 20:01:26 2025 X-Loop: help-debbugs@gnu.org Subject: bug#8260: which-function fails to find current function name Resent-From: Ralph Schleicher Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 15 Mar 2011 20:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 8260 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 8260@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.13002200028277 (code B ref -1); Tue, 15 Mar 2011 20:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Mar 2011 20:13:22 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PzacL-00029S-IJ for submit@debbugs.gnu.org; Tue, 15 Mar 2011 16:13:22 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Pzaab-000262-Lx for submit@debbugs.gnu.org; Tue, 15 Mar 2011 16:11:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzaaV-00080r-GB for submit@debbugs.gnu.org; Tue, 15 Mar 2011 16:11:28 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([199.232.76.165]:42850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PzaaV-00080m-EE for submit@debbugs.gnu.org; Tue, 15 Mar 2011 16:11:27 -0400 Received: from [140.186.70.92] (port=61000 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzaaT-0005fo-Dx for bug-gnu-emacs@gnu.org; Tue, 15 Mar 2011 16:11:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzaaS-00080C-5x for bug-gnu-emacs@gnu.org; Tue, 15 Mar 2011 16:11:25 -0400 Received: from dd24230.kasserver.com ([85.13.143.176]:52072) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PzaaR-000804-Un for bug-gnu-emacs@gnu.org; Tue, 15 Mar 2011 16:11:24 -0400 Received: from bravo.mueller-schleicher.de (p57ADB606.dip.t-dialin.net [87.173.182.6]) by dd24230.kasserver.com (Postfix) with ESMTPA id 489554A80AF for ; Tue, 15 Mar 2011 21:11:22 +0100 (CET) Received: by bravo.mueller-schleicher.de (Postfix, from userid 1000) id B03705C251; Tue, 15 Mar 2011 21:11:21 +0100 (CET) From: Ralph Schleicher Organization: Ralph Schleicher Date: Tue, 15 Mar 2011 21:11:21 +0100 Message-ID: <8739mojg9i.fsf@bravo.mueller-schleicher.i> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 199.232.76.165 X-Spam-Score: -6.6 (------) X-Mailman-Approved-At: Tue, 15 Mar 2011 16:13:19 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.6 (------) Hi, which-function fails to find the current function name if a major mode adjusts add-log-current-defun-header-regexp but does not bind add-log-current-defun-function. Thus, which-function shall call add-log-current-defun to query the current function name. Below is a patch together with a change log entry. 2011-03-11 Ralph Schleicher * progmodes/which-func.el (which-function): Call add-log-current-defun instead of evaluating add-log-current-defun-function directly. --- emacs-23.3/lisp/progmodes/which-func.el.orig 2011-01-08 12:45:14 +0100 +++ emacs-23.3/lisp/progmodes/which-func.el 2011-03-11 11:41:04 +0100 @@ -270,7 +270,7 @@ (defun which-function () "Return current function name based on point. Uses `which-func-functions', `imenu--index-alist' -or `add-log-current-defun-function'. +or `add-log-current-defun'. If no function name is found, return nil." (let ((name ;; Try the `which-func-functions' functions first. @@ -319,9 +319,8 @@ imstack (cdr imstack)))))) ;; Try using add-log support. - (when (and (null name) (boundp 'add-log-current-defun-function) - add-log-current-defun-function) - (setq name (funcall add-log-current-defun-function))) + (when (null name) + (setq name (add-log-current-defun))) ;; Filter the name if requested. (when name (if which-func-cleanup-function -- Ralph From unknown Fri Aug 15 20:01:26 2025 X-Loop: help-debbugs@gnu.org Subject: bug#8260: which-function fails to find current function name Resent-From: Chong Yidong Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 08 May 2011 18:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 8260 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Ralph Schleicher Cc: 8260@debbugs.gnu.org Received: via spool by 8260-submit@debbugs.gnu.org id=B8260.130487940410926 (code B ref 8260); Sun, 08 May 2011 18:31:01 +0000 Received: (at 8260) by debbugs.gnu.org; 8 May 2011 18:30:04 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QJ8jz-0002qA-IH for submit@debbugs.gnu.org; Sun, 08 May 2011 14:30:03 -0400 Received: from vm-emlprdomr-05.its.yale.edu ([130.132.50.146]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QJ8jx-0002pi-Q0 for 8260@debbugs.gnu.org; Sun, 08 May 2011 14:30:02 -0400 Received: from furball (c-71-192-165-84.hsd1.ct.comcast.net [71.192.165.84]) (authenticated bits=0) by vm-emlprdomr-05.its.yale.edu (8.14.4/8.14.4) with ESMTP id p48ITtNP017593 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sun, 8 May 2011 14:29:56 -0400 Received: by furball (Postfix, from userid 1000) id 9583A160603; Sun, 8 May 2011 14:29:55 -0400 (EDT) From: Chong Yidong References: <8739mojg9i.fsf@bravo.mueller-schleicher.i> Date: Sun, 08 May 2011 14:29:55 -0400 In-Reply-To: <8739mojg9i.fsf@bravo.mueller-schleicher.i> (Ralph Schleicher's message of "Tue, 15 Mar 2011 21:11:21 +0100") Message-ID: <87k4e16o64.fsf@stupidchicken.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.71 on 130.132.50.146 X-Spam-Score: -2.6 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) Ralph Schleicher writes: > which-function fails to find the current function name if a major > mode adjusts add-log-current-defun-header-regexp but does not bind > add-log-current-defun-function. Thus, which-function shall call > add-log-current-defun to query the current function name. Below > is a patch together with a change log entry. Applied, thanks. From debbugs-submit-bounces@debbugs.gnu.org Sun May 08 14:30:17 2011 Received: (at control) by debbugs.gnu.org; 8 May 2011 18:30:17 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QJ8kC-0003Bh-Pi for submit@debbugs.gnu.org; Sun, 08 May 2011 14:30:16 -0400 Received: from vm-emlprdomr-04.its.yale.edu ([130.132.50.145]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QJ8kC-000325-4a for control@debbugs.gnu.org; Sun, 08 May 2011 14:30:16 -0400 Received: from furball (c-71-192-165-84.hsd1.ct.comcast.net [71.192.165.84]) (authenticated bits=0) by vm-emlprdomr-04.its.yale.edu (8.14.4/8.14.4) with ESMTP id p48IUAcV028387 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Sun, 8 May 2011 14:30:10 -0400 Received: by furball (Postfix, from userid 1000) id DD82F160603; Sun, 8 May 2011 14:30:09 -0400 (EDT) From: Chong Yidong To: control@debbugs.gnu.org Subject: close 8260 Date: Sun, 08 May 2011 14:30:09 -0400 Message-ID: <87wri159la.fsf@stupidchicken.com> MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.71 on 130.132.50.145 X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) close 8260 thanks