From: Ralph Schleicher Date: Sun, 8 May 2011 18:29:35 +0000 (-0400) Subject: Handle missing add-log-current-defun-function in Which Func mode (Bug#8260) X-Git-Tag: emacs-pretest-24.0.90~104^3~56 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6eea50c73be34e865dabf14cbd2d0e7c4f64e6a0;p=emacs.git 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. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 69e88468eb8..3bbc9e2f377 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-05-08 Ralph Schleicher + + * 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 * net/tramp.el (tramp-process-actions): Add POS argument. Delete diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el index 0d622f14393..6b794d36099 100644 --- a/lisp/progmodes/which-func.el +++ b/lisp/progmodes/which-func.el @@ -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