Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

(which-function): Call imenu--make-index-alist

Browse source 
if necessary to get a list of functions.
(which-function-imenu-failed): New variable.
(which-func-update): Handle all visible windows.
(which-func-update-1): New subroutine broken out of which-func-update.
This commit is contained in:
Richard M. Stallman 2001-11-22 00:08:32 +00:00
parent 1ff74324b1
commit ecafbba26b
2 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,5 +1,11 @@
2001-11-21 Richard M. Stallman <rms@gnu.org>
* which-func.el (which-function): Call imenu--make-index-alist
if necessary to get a list of functions.
(which-function-imenu-failed): New variable.
(which-func-update): Handle all visible windows.
(which-func-update-1): New subroutine broken out of which-func-update.
* files.el (temporary-file-directory, null-device)
(small-temporary-file-directory): Definitions moved up.

41
lisp/which-func.el
View file

@ -153,17 +153,24 @@ It creates the Imenu index for the buffer, if necessary."
(setq which-func-mode nil))))
(defun which-func-update ()
;; Update the string containing the current function.
(when which-func-mode
(condition-case info
(progn
(setq which-func-current (or (which-function) which-func-unknown))
(unless (string= which-func-current which-func-previous)
(force-mode-line-update)
(setq which-func-previous which-func-current)))
(error
(which-func-mode -1)
(error "Error in which-func-update: %s" info)))))
"Update the Which-Function mode display for all windows."
(walk-windows 'which-func-update-1 nil 'visible))
(defun which-func-update-1 (window)
"Update the Which-Function mode display for window WINDOW."
(save-selected-window
(select-window window)
;; Update the string containing the current function.
(when which-func-mode
(condition-case info
(progn
(setq which-func-current (or (which-function) which-func-unknown))
(unless (string= which-func-current which-func-previous)
(force-mode-line-update)
(setq which-func-previous which-func-current)))
(error
(which-func-mode -1)
(error "Error in which-func-update: %s" info))))))
;;;###autoload
(defalias 'which-func-mode 'which-function-mode)
@ -192,12 +199,22 @@ and off otherwise."
(dolist (buf (buffer-list))
(with-current-buffer buf (setq which-func-mode nil)))))
(defvar which-function-imenu-failed nil
"Locally t in a buffer if `imenu--make-index-alist' found nothing there.")
(defun which-function ()
"Return current function name based on point.
Uses `imenu--index-alist' or `add-log-current-defun-function'.
If no function name is found, return nil."
(let (name)
;; First try using imenu support.
;; If Imenu is loaded, try to make an index alist with it.
(when (and (boundp 'imenu--index-alist) (null imenu--index-alist)
(null which-function-imenu-failed))
(imenu--make-index-alist)
(unless imenu--index-alist
(make-local-variable 'which-function-imenu-failed)
(setq which-function-imenu-failed t)))
;; If we have an index alist, use it.
(when (and (boundp 'imenu--index-alist) imenu--index-alist)
(let ((pair (car-safe imenu--index-alist))
(rest (cdr-safe imenu--index-alist)))