diff options
| author | Juanma Barranquero | 2012-04-19 23:34:49 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2012-04-19 23:34:49 +0200 |
| commit | 5b01685cc194de3d566003bd264b2bf600ab8067 (patch) | |
| tree | 9db8c7fa478b3d22b5c5d732c63272f3749512f3 | |
| parent | 4d6769e1bb5109e9cec202350d5252234970d525 (diff) | |
| download | emacs-5b01685cc194de3d566003bd264b2bf600ab8067.tar.gz emacs-5b01685cc194de3d566003bd264b2bf600ab8067.zip | |
lisp/imenu.el (imenu-progress-message): Restore.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/imenu.el | 23 |
2 files changed, 28 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9ad019328d6..5131fa112a7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2012-04-19 Juanma Barranquero <lekktu@gmail.com> | 1 | 2012-04-19 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 2 | ||
| 3 | * imenu.el (imenu-progress-message): Restore; it is "used" in | ||
| 4 | erc/erc-imenu.el and net/snmp-mode.el. | ||
| 5 | |||
| 6 | 2012-04-19 Juanma Barranquero <lekktu@gmail.com> | ||
| 7 | |||
| 3 | * avoid.el (mouse-avoidance-mode): Mark unused arg. | 8 | * avoid.el (mouse-avoidance-mode): Mark unused arg. |
| 4 | (mouse-avoidance-nudge-mouse): Remove unused binding. | 9 | (mouse-avoidance-nudge-mouse): Remove unused binding. |
| 5 | 10 | ||
diff --git a/lisp/imenu.el b/lisp/imenu.el index ceea9420c4c..12ac3540925 100644 --- a/lisp/imenu.el +++ b/lisp/imenu.el | |||
| @@ -266,6 +266,29 @@ The function in this variable is called when selecting a normal index-item.") | |||
| 266 | (and (consp (cdr item)) (listp (cadr item)) | 266 | (and (consp (cdr item)) (listp (cadr item)) |
| 267 | (not (eq (car (cadr item)) 'lambda)))) | 267 | (not (eq (car (cadr item)) 'lambda)))) |
| 268 | 268 | ||
| 269 | ;; Macro to display a progress message. | ||
| 270 | ;; RELPOS is the relative position to display. | ||
| 271 | ;; If RELPOS is nil, then the relative position in the buffer | ||
| 272 | ;; is calculated. | ||
| 273 | ;; PREVPOS is the variable in which we store the last position displayed. | ||
| 274 | (defmacro imenu-progress-message (prevpos &optional relpos reverse) | ||
| 275 | |||
| 276 | ;; Made obsolete/empty, as computers are now faster than the eye, and | ||
| 277 | ;; it had problems updating the messages correctly, and could shadow | ||
| 278 | ;; more important messages/prompts in the minibuffer. KFS 2004-10-27. | ||
| 279 | |||
| 280 | ;; `(and | ||
| 281 | ;; imenu-scanning-message | ||
| 282 | ;; (let ((pos ,(if relpos | ||
| 283 | ;; relpos | ||
| 284 | ;; `(imenu--relative-position ,reverse)))) | ||
| 285 | ;; (if ,(if relpos t | ||
| 286 | ;; `(> pos (+ 5 ,prevpos))) | ||
| 287 | ;; (progn | ||
| 288 | ;; (message imenu-scanning-message pos) | ||
| 289 | ;; (setq ,prevpos pos))))) | ||
| 290 | ) | ||
| 291 | |||
| 269 | 292 | ||
| 270 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 293 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 271 | ;;;; | 294 | ;;;; |