Mercurial > emacs
annotate lisp/which-func.el @ 38709:00a56d6da660
(image-type-regexps): Use `\`' instead of `^' in
most regular expressions.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Tue, 07 Aug 2001 08:03:10 +0000 |
| parents | e5c58ab7a99f |
| children | 9e8cfa1e3b05 |
| rev | line source |
|---|---|
|
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Jan?k <Pavel@Janik.cz>
parents:
38423
diff
changeset
|
1 ;;; which-func.el --- print current function in mode line |
| 20321 | 2 |
|
38405
d215f2e13397
(which-func-mode, which-func-ff-hook)
Gerd Moellmann <gerd@gnu.org>
parents:
38194
diff
changeset
|
3 ;; Copyright (C) 1994, 1997, 1998, 2001 Free Software Foundation, Inc. |
| 20321 | 4 |
| 5 ;; Author: Alex Rezinsky <alexr@msil.sps.mot.com> | |
|
33702
683f3781ab81
Update maintainer line.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32190
diff
changeset
|
6 ;; (doesn't seem to be responsive any more) |
| 21697 | 7 ;; Keywords: mode-line, imenu, tools |
| 20321 | 8 |
| 9 ;; This file is part of GNU Emacs. | |
| 10 | |
| 11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
| 12 ;; it under the terms of the GNU General Public License as published by | |
| 13 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 14 ;; any later version. | |
| 15 | |
| 16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
| 17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 19 ;; GNU General Public License for more details. | |
| 20 | |
| 21 ;; You should have received a copy of the GNU General Public License | |
| 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
| 23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 24 ;; Boston, MA 02111-1307, USA. | |
| 25 | |
| 21697 | 26 ;;; Commentary: |
| 27 | |
| 28 ;; This package prints name of function where your current point is | |
| 29 ;; located in mode line. It assumes that you work with imenu package | |
| 30 ;; and imenu--index-alist is up to date. | |
| 20321 | 31 |
| 21697 | 32 ;; KNOWN BUGS |
| 33 ;; ---------- | |
| 34 ;; Really this package shows not "function where the current point is | |
| 35 ;; located now", but "nearest function which defined above the current | |
| 36 ;; point". So if your current point is located after end of function | |
| 37 ;; FOO but before begin of function BAR, FOO will be displayed in mode | |
| 38 ;; line. | |
|
36606
a72b3da04728
(which-func-modes): Add cperl-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35990
diff
changeset
|
39 ;; - if two windows display the same buffer, both windows |
|
a72b3da04728
(which-func-modes): Add cperl-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35990
diff
changeset
|
40 ;; show the same `which-func' information. |
| 20321 | 41 |
| 21697 | 42 ;; TODO LIST |
| 43 ;; --------- | |
| 44 ;; 1. Dependence on imenu package should be removed. Separate | |
| 45 ;; function determination mechanism should be used to determine the end | |
| 46 ;; of a function as well as the beginning of a function. | |
| 47 ;; 2. This package should be realized with the help of overlay | |
| 48 ;; properties instead of imenu--index-alist variable. | |
| 49 | |
| 50 ;;; History: | |
| 20321 | 51 |
| 21697 | 52 ;; THANKS TO |
| 53 ;; --------- | |
| 54 ;; Per Abrahamsen <abraham@iesd.auc.dk> | |
| 55 ;; Some ideas (inserting in mode-line, using of post-command hook | |
| 56 ;; and toggling this mode) have been borrowed from his package | |
| 57 ;; column.el | |
| 58 ;; Peter Eisenhauer <pipe@fzi.de> | |
| 59 ;; Bug fixing in case nested indexes. | |
| 60 ;; Terry Tateyama <ttt@ursa0.cs.utah.edu> | |
| 61 ;; Suggestion to use find-file-hooks for first imenu | |
| 62 ;; index building. | |
| 20321 | 63 |
| 21697 | 64 ;;; Code: |
| 65 | |
| 66 ;; Variables for customization | |
| 67 ;; --------------------------- | |
| 68 ;; | |
| 20321 | 69 (defvar which-func-unknown "???" |
| 70 "String to display in the mode line when current function is unknown.") | |
| 71 | |
|
21653
e95a88dc6110
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
20573
diff
changeset
|
72 (defgroup which-func nil |
|
e95a88dc6110
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
20573
diff
changeset
|
73 "Mode to display the current function name in the modeline." |
|
e95a88dc6110
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
20573
diff
changeset
|
74 :group 'tools |
|
e95a88dc6110
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
20573
diff
changeset
|
75 :version "20.3") |
|
e95a88dc6110
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
20573
diff
changeset
|
76 |
|
32190
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
77 (defcustom which-func-modes |
|
36606
a72b3da04728
(which-func-modes): Add cperl-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35990
diff
changeset
|
78 '(emacs-lisp-mode c-mode c++-mode perl-mode cperl-mode makefile-mode |
|
a72b3da04728
(which-func-modes): Add cperl-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35990
diff
changeset
|
79 sh-mode fortran-mode) |
|
22134
29c2db002dd5
(which-func-modes): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
21964
diff
changeset
|
80 "List of major modes for which Which Function mode should be used. |
| 20321 | 81 For other modes it is disabled. If this is equal to t, |
|
22134
29c2db002dd5
(which-func-modes): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
21964
diff
changeset
|
82 then Which Function mode is enabled in any major mode that supports it." |
| 20321 | 83 :group 'which-func |
| 84 :type '(choice (const :tag "All modes" t) | |
|
22134
29c2db002dd5
(which-func-modes): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
21964
diff
changeset
|
85 (repeat (symbol :tag "Major mode")))) |
| 20321 | 86 |
|
21964
390352ec56c6
(which-func-non-auto-modes): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21960
diff
changeset
|
87 (defcustom which-func-non-auto-modes nil |
|
390352ec56c6
(which-func-non-auto-modes): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
21960
diff
changeset
|
88 "List of major modes where Which Function mode is inactive till Imenu is used. |
|
22134
29c2db002dd5
(which-func-modes): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
21964
diff
changeset
|
89 This means that Which Function mode won't really do anything |
|
29c2db002dd5
(which-func-modes): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
21964
diff
changeset
|
90 until you use Imenu, in these modes. Note that files |
|
29c2db002dd5
(which-func-modes): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
21964
diff
changeset
|
91 larger than `which-func-maxout' behave in this way too; |
|
29c2db002dd5
(which-func-modes): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
21964
diff
changeset
|
92 Which Function mode doesn't do anything until you use Imenu." |
| 20321 | 93 :group 'which-func |
|
22134
29c2db002dd5
(which-func-modes): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
21964
diff
changeset
|
94 :type '(repeat (symbol :tag "Major mode"))) |
| 20321 | 95 |
|
38194
a23820c19d03
(which-func-maxout): Increase default to 500000.
Richard M. Stallman <rms@gnu.org>
parents:
36606
diff
changeset
|
96 (defcustom which-func-maxout 500000 |
| 20321 | 97 "Don't automatically compute the Imenu menu if buffer is this big or bigger. |
| 98 Zero means compute the Imenu menu regardless of size." | |
| 99 :group 'which-func | |
| 100 :type 'integer) | |
| 101 | |
|
32190
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
102 (defcustom which-func-format '("[" which-func-current "]") |
| 20321 | 103 "Format for displaying the function in the mode line." |
| 104 :group 'which-func | |
| 105 :type 'sexp) | |
| 106 | |
|
25425
f85f374e5395
(which-func-cleanup-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
24649
diff
changeset
|
107 (defvar which-func-cleanup-function nil |
|
f85f374e5395
(which-func-cleanup-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
24649
diff
changeset
|
108 "Function to transform a string before displaying it in the mode line. |
|
f85f374e5395
(which-func-cleanup-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
24649
diff
changeset
|
109 The function is called with one argument, the string to display. |
|
f85f374e5395
(which-func-cleanup-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
24649
diff
changeset
|
110 Its return value is displayed in the modeline. |
|
f85f374e5395
(which-func-cleanup-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
24649
diff
changeset
|
111 If nil, no function is called. The default value is nil. |
|
f85f374e5395
(which-func-cleanup-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
24649
diff
changeset
|
112 |
|
f85f374e5395
(which-func-cleanup-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
24649
diff
changeset
|
113 This feature can be useful if Imenu is set up to make more |
|
f85f374e5395
(which-func-cleanup-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
24649
diff
changeset
|
114 detailed entries (e.g., containing the argument list of a function), |
|
f85f374e5395
(which-func-cleanup-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
24649
diff
changeset
|
115 and you want to simplify them for the mode line |
|
f85f374e5395
(which-func-cleanup-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
24649
diff
changeset
|
116 \(e.g., removing the parameter list to just have the function name.)") |
|
f85f374e5395
(which-func-cleanup-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
24649
diff
changeset
|
117 |
| 20321 | 118 ;;; Code, nothing to customize below here |
| 119 ;;; ------------------------------------- | |
| 120 ;;; | |
| 121 (require 'imenu) | |
| 122 | |
| 123 (defvar which-func-current which-func-unknown) | |
| 124 (defvar which-func-previous which-func-unknown) | |
| 125 (make-variable-buffer-local 'which-func-current) | |
| 126 (make-variable-buffer-local 'which-func-previous) | |
| 127 | |
| 128 (defvar which-func-mode nil | |
| 129 "Non-nil means display current function name in mode line. | |
| 38437 | 130 This makes a difference only if `which-function-mode' is non-nil.") |
| 20321 | 131 (make-variable-buffer-local 'which-func-mode) |
|
32190
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
132 ;;(put 'which-func-mode 'permanent-local t) |
| 20321 | 133 |
| 134 (add-hook 'find-file-hooks 'which-func-ff-hook t) | |
| 135 | |
| 136 (defun which-func-ff-hook () | |
| 137 "File find hook for Which Function mode. | |
| 138 It creates the Imenu index for the buffer, if necessary." | |
|
32190
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
139 (setq which-func-mode |
|
38405
d215f2e13397
(which-func-mode, which-func-ff-hook)
Gerd Moellmann <gerd@gnu.org>
parents:
38194
diff
changeset
|
140 (and which-function-mode |
|
d215f2e13397
(which-func-mode, which-func-ff-hook)
Gerd Moellmann <gerd@gnu.org>
parents:
38194
diff
changeset
|
141 (or (eq which-func-modes t) |
|
d215f2e13397
(which-func-mode, which-func-ff-hook)
Gerd Moellmann <gerd@gnu.org>
parents:
38194
diff
changeset
|
142 (member major-mode which-func-modes)))) |
| 20321 | 143 |
|
22308
87366acfb1e9
(which-func-ff-hook): If imenu gets error,
Karl Heuer <kwzh@gnu.org>
parents:
22134
diff
changeset
|
144 (condition-case nil |
|
87366acfb1e9
(which-func-ff-hook): If imenu gets error,
Karl Heuer <kwzh@gnu.org>
parents:
22134
diff
changeset
|
145 (if (and which-func-mode |
|
87366acfb1e9
(which-func-ff-hook): If imenu gets error,
Karl Heuer <kwzh@gnu.org>
parents:
22134
diff
changeset
|
146 (not (member major-mode which-func-non-auto-modes)) |
|
32190
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
147 (or (null which-func-maxout) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
148 (< buffer-saved-size which-func-maxout) |
|
22308
87366acfb1e9
(which-func-ff-hook): If imenu gets error,
Karl Heuer <kwzh@gnu.org>
parents:
22134
diff
changeset
|
149 (= which-func-maxout 0))) |
|
87366acfb1e9
(which-func-ff-hook): If imenu gets error,
Karl Heuer <kwzh@gnu.org>
parents:
22134
diff
changeset
|
150 (setq imenu--index-alist |
|
87366acfb1e9
(which-func-ff-hook): If imenu gets error,
Karl Heuer <kwzh@gnu.org>
parents:
22134
diff
changeset
|
151 (save-excursion (funcall imenu-create-index-function)))) |
|
87366acfb1e9
(which-func-ff-hook): If imenu gets error,
Karl Heuer <kwzh@gnu.org>
parents:
22134
diff
changeset
|
152 (error |
|
87366acfb1e9
(which-func-ff-hook): If imenu gets error,
Karl Heuer <kwzh@gnu.org>
parents:
22134
diff
changeset
|
153 (setq which-func-mode nil)))) |
| 20321 | 154 |
| 155 (defun which-func-update () | |
| 156 ;; Update the string containing the current function. | |
|
32190
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
157 (when which-func-mode |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
158 (condition-case info |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
159 (progn |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
160 (setq which-func-current (or (which-function) which-func-unknown)) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
161 (unless (string= which-func-current which-func-previous) |
|
20573
b46523ef0e0a
(which-func-update): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents:
20322
diff
changeset
|
162 (force-mode-line-update) |
|
32190
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
163 (setq which-func-previous which-func-current))) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
164 (error |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
165 (which-func-mode -1) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
166 (error "Error in which-func-update: %s" info))))) |
| 20321 | 167 |
|
38194
a23820c19d03
(which-func-maxout): Increase default to 500000.
Richard M. Stallman <rms@gnu.org>
parents:
36606
diff
changeset
|
168 ;;;###autoload |
|
a23820c19d03
(which-func-maxout): Increase default to 500000.
Richard M. Stallman <rms@gnu.org>
parents:
36606
diff
changeset
|
169 (defalias 'which-func-mode 'which-function-mode) |
|
a23820c19d03
(which-func-maxout): Increase default to 500000.
Richard M. Stallman <rms@gnu.org>
parents:
36606
diff
changeset
|
170 |
|
21960
79c7369b9ab4
(which-function-mode): New alias.
Richard M. Stallman <rms@gnu.org>
parents:
21697
diff
changeset
|
171 ;; This is the name people would normally expect. |
|
79c7369b9ab4
(which-function-mode): New alias.
Richard M. Stallman <rms@gnu.org>
parents:
21697
diff
changeset
|
172 ;;;###autoload |
|
38194
a23820c19d03
(which-func-maxout): Increase default to 500000.
Richard M. Stallman <rms@gnu.org>
parents:
36606
diff
changeset
|
173 (define-minor-mode which-function-mode |
| 20321 | 174 "Toggle Which Function mode, globally. |
| 175 When Which Function mode is enabled, the current function name is | |
| 176 continuously displayed in the mode line, in certain major modes. | |
| 177 | |
|
32190
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
178 With prefix ARG, turn Which Function mode on iff arg is positive, |
| 20321 | 179 and off otherwise." |
|
36606
a72b3da04728
(which-func-modes): Add cperl-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35990
diff
changeset
|
180 :global t :group 'which-func |
|
38405
d215f2e13397
(which-func-mode, which-func-ff-hook)
Gerd Moellmann <gerd@gnu.org>
parents:
38194
diff
changeset
|
181 (if which-function-mode |
|
35990
7ded5b71182f
(which-func-mode): Invert which-func-mode-global.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33702
diff
changeset
|
182 ;;Turn it on |
|
32190
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
183 (progn |
|
35990
7ded5b71182f
(which-func-mode): Invert which-func-mode-global.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33702
diff
changeset
|
184 (add-hook 'post-command-idle-hook 'which-func-update) |
|
7ded5b71182f
(which-func-mode): Invert which-func-mode-global.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33702
diff
changeset
|
185 (dolist (buf (buffer-list)) |
|
7ded5b71182f
(which-func-mode): Invert which-func-mode-global.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33702
diff
changeset
|
186 (with-current-buffer buf |
|
7ded5b71182f
(which-func-mode): Invert which-func-mode-global.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33702
diff
changeset
|
187 (setq which-func-mode |
|
7ded5b71182f
(which-func-mode): Invert which-func-mode-global.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33702
diff
changeset
|
188 (or (eq which-func-modes t) |
|
7ded5b71182f
(which-func-mode): Invert which-func-mode-global.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33702
diff
changeset
|
189 (member major-mode which-func-modes)))))) |
|
7ded5b71182f
(which-func-mode): Invert which-func-mode-global.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33702
diff
changeset
|
190 ;; Turn it off |
|
7ded5b71182f
(which-func-mode): Invert which-func-mode-global.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33702
diff
changeset
|
191 (remove-hook 'post-command-idle-hook 'which-func-update) |
|
32190
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
192 (dolist (buf (buffer-list)) |
|
35990
7ded5b71182f
(which-func-mode): Invert which-func-mode-global.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33702
diff
changeset
|
193 (with-current-buffer buf (setq which-func-mode nil))))) |
| 20321 | 194 |
| 195 (defun which-function () | |
| 21697 | 196 "Return current function name based on point. |
|
36606
a72b3da04728
(which-func-modes): Add cperl-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35990
diff
changeset
|
197 Uses `imenu--index-alist' or `add-log-current-defun-function'. |
|
a72b3da04728
(which-func-modes): Add cperl-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35990
diff
changeset
|
198 If no function name is found, return nil." |
|
32190
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
199 (let (name) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
200 ;; First try using imenu support. |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
201 (when (and (boundp 'imenu--index-alist) imenu--index-alist) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
202 (let ((pair (car-safe imenu--index-alist)) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
203 (rest (cdr-safe imenu--index-alist))) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
204 (while (and (or rest pair) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
205 (or (not (number-or-marker-p (cdr pair))) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
206 (> (point) (cdr pair)))) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
207 (setq name (car pair)) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
208 (setq pair (car-safe rest)) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
209 (setq rest (cdr-safe rest))))) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
210 ;; Try using add-log support. |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
211 (when (and (null name) (boundp 'add-log-current-defun-function) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
212 add-log-current-defun-function) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
213 (setq name (funcall add-log-current-defun-function))) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
214 ;; Filter the name if requested. |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
215 (when name |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
216 (if which-func-cleanup-function |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
217 (funcall which-func-cleanup-function name) |
|
af0c1b2c3d6e
(which-func-format): Remove spurious space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25425
diff
changeset
|
218 name)))) |
| 20321 | 219 |
| 220 (provide 'which-func) | |
| 221 | |
|
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Jan?k <Pavel@Janik.cz>
parents:
38423
diff
changeset
|
222 ;;; which-func.el ends here |
