mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-17 17:58:46 +00:00
Code Issues Releases Activity

Handle missing add-log-current-defun-function in Which Func mode (Bug#8260)

Browse Source 
* lisp/progmodes/which-func.el (which-function): Use
add-log-current-defun instead of add-log-current-defun-function,
which might not be defined.
This commit is contained in:
Ralph Schleicher 2011-05-08 14:29:35 -04:00 committed by Chong Yidong
parent bc3bea9cf0
commit 6eea50c73b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2011-05-08 Ralph Schleicher <rs@ralph-schleicher.de>
* progmodes/which-func.el (which-function): Use
add-log-current-defun instead of add-log-current-defun-function,
which might not be defined (Bug#8260).
2011-04-25 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-process-actions): Add POS argument. Delete

7
lisp/progmodes/which-func.el
View File

@ -270,7 +270,7 @@ It calls them sequentially, and if any returns non-nil,
(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 @@ If no function name is found, return nil."
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