Commit 6eea50c7 authored by Ralph Schleicher's avatar Ralph Schleicher Committed by Chong Yidong
Browse files

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

* lisp/progmodes/which-func.el (which-function): Use
add-log-current-defun instead of add-log-current-defun-function,
which might not be defined.
parent bc3bea9c
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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment