diff options
| author | Kim F. Storm | 2004-10-28 14:11:32 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2004-10-28 14:11:32 +0000 |
| commit | 9d4af4c7b86857bbd36d14a27fedcbf30b0fefcb (patch) | |
| tree | 9b590c8b22caddf8c2ce7ab70194d9e78e15e7ce | |
| parent | a00725c71bb52f2f05a9a6c6430bfdb0f7372b13 (diff) | |
| download | emacs-9d4af4c7b86857bbd36d14a27fedcbf30b0fefcb.tar.gz emacs-9d4af4c7b86857bbd36d14a27fedcbf30b0fefcb.zip | |
(imenu-scanning-message): Remove.
(imenu-progress-message): Make it a no-op.
| -rw-r--r-- | lisp/imenu.el | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/lisp/imenu.el b/lisp/imenu.el index 924746f3bd1..7c775dc6337 100644 --- a/lisp/imenu.el +++ b/lisp/imenu.el | |||
| @@ -161,16 +161,17 @@ element should come before the second. The arguments are cons cells; | |||
| 161 | :type 'integer | 161 | :type 'integer |
| 162 | :group 'imenu) | 162 | :group 'imenu) |
| 163 | 163 | ||
| 164 | (defcustom imenu-scanning-message "Scanning buffer for index (%3d%%)" | 164 | ;; No longer used. KFS 2004-10-27 |
| 165 | "*Progress message during the index scanning of the buffer. | 165 | ;; (defcustom imenu-scanning-message "Scanning buffer for index (%3d%%)" |
| 166 | If non-nil, user gets a message during the scanning of the buffer. | 166 | ;; "*Progress message during the index scanning of the buffer. |
| 167 | 167 | ;; If non-nil, user gets a message during the scanning of the buffer. | |
| 168 | Relevant only if the mode-specific function that creates the buffer | 168 | ;; |
| 169 | index use `imenu-progress-message', and not useful if that is fast, in | 169 | ;; Relevant only if the mode-specific function that creates the buffer |
| 170 | which case you might as well set this to nil." | 170 | ;; index use `imenu-progress-message', and not useful if that is fast, in |
| 171 | :type '(choice string | 171 | ;; which case you might as well set this to nil." |
| 172 | (const :tag "None" nil)) | 172 | ;; :type '(choice string |
| 173 | :group 'imenu) | 173 | ;; (const :tag "None" nil)) |
| 174 | ;; :group 'imenu) | ||
| 174 | 175 | ||
| 175 | (defcustom imenu-space-replacement "." | 176 | (defcustom imenu-space-replacement "." |
| 176 | "*The replacement string for spaces in index names. | 177 | "*The replacement string for spaces in index names. |
| @@ -300,16 +301,22 @@ The function in this variable is called when selecting a normal index-item.") | |||
| 300 | ;; is calculated. | 301 | ;; is calculated. |
| 301 | ;; PREVPOS is the variable in which we store the last position displayed. | 302 | ;; PREVPOS is the variable in which we store the last position displayed. |
| 302 | (defmacro imenu-progress-message (prevpos &optional relpos reverse) | 303 | (defmacro imenu-progress-message (prevpos &optional relpos reverse) |
| 303 | `(and | 304 | |
| 304 | imenu-scanning-message | 305 | ;; Made obsolete/empty, as computers are now faster than the eye, and |
| 305 | (let ((pos ,(if relpos | 306 | ;; it had problems updating the messages correctly, and could shadow |
| 306 | relpos | 307 | ;; more important messages/prompts in the minibuffer. KFS 2004-10-27. |
| 307 | `(imenu--relative-position ,reverse)))) | 308 | |
| 308 | (if ,(if relpos t | 309 | ;; `(and |
| 309 | `(> pos (+ 5 ,prevpos))) | 310 | ;; imenu-scanning-message |
| 310 | (progn | 311 | ;; (let ((pos ,(if relpos |
| 311 | (message imenu-scanning-message pos) | 312 | ;; relpos |
| 312 | (setq ,prevpos pos)))))) | 313 | ;; `(imenu--relative-position ,reverse)))) |
| 314 | ;; (if ,(if relpos t | ||
| 315 | ;; `(> pos (+ 5 ,prevpos))) | ||
| 316 | ;; (progn | ||
| 317 | ;; (message imenu-scanning-message pos) | ||
| 318 | ;; (setq ,prevpos pos))))) | ||
| 319 | ) | ||
| 313 | 320 | ||
| 314 | 321 | ||
| 315 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 322 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| @@ -765,7 +772,7 @@ the alist look like: | |||
| 765 | (INDEX-NAME . INDEX-POSITION) | 772 | (INDEX-NAME . INDEX-POSITION) |
| 766 | or like: | 773 | or like: |
| 767 | (INDEX-NAME INDEX-POSITION FUNCTION ARGUMENTS...) | 774 | (INDEX-NAME INDEX-POSITION FUNCTION ARGUMENTS...) |
| 768 | They may also be nested index alists like: | 775 | They may also be nested index alists like: |
| 769 | (INDEX-NAME . INDEX-ALIST) | 776 | (INDEX-NAME . INDEX-ALIST) |
| 770 | depending on PATTERNS." | 777 | depending on PATTERNS." |
| 771 | 778 | ||