[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 0613e7a: which-function: Do not display outdated im
From: |
Alex Branham |
Subject: |
[Emacs-diffs] master 0613e7a: which-function: Do not display outdated imenu information |
Date: |
Fri, 22 Feb 2019 16:27:52 -0500 (EST) |
branch: master
commit 0613e7a38efc3b0534e0ca5c5fa401e2a3bda906
Author: Alex Branham <address@hidden>
Commit: Alex Branham <address@hidden>
which-function: Do not display outdated imenu information
* lisp/progmodes/which-func.el (which-function): Check
`add-log-current-defun' before imenu. Update `imenu--index-alist' if
needed. Bug#33695
---
lisp/progmodes/which-func.el | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 40a74d1..564e0ff 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -272,16 +272,21 @@ 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'.
+Uses `which-func-functions', `add-log-current-defun'.
+or `imenu--index-alist'
If no function name is found, return nil."
(let ((name
;; Try the `which-func-functions' functions first.
(run-hook-with-args-until-success 'which-func-functions)))
-
+ ;; Try using add-log support.
+ (when (null name)
+ (setq name (add-log-current-defun)))
;; If Imenu is loaded, try to make an index alist with it.
(when (and (null name)
- (boundp 'imenu--index-alist) (null imenu--index-alist)
+ (boundp 'imenu--index-alist)
+ (or (null imenu--index-alist)
+ ;; Update if outdated
+ (/= (buffer-chars-modified-tick)
imenu-menubar-modified-tick))
(null which-function-imenu-failed))
(ignore-errors (imenu--make-index-alist t))
(unless imenu--index-alist
@@ -323,10 +328,6 @@ If no function name is found, return nil."
(funcall
which-func-imenu-joiner-function
(reverse (cons (car pair) namestack))))))))))))
-
- ;; Try using add-log support.
- (when (null name)
- (setq name (add-log-current-defun)))
;; Filter the name if requested.
(when name
(if which-func-cleanup-function
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 0613e7a: which-function: Do not display outdated imenu information,
Alex Branham <=