Mercurial > emacs
comparison lisp/imenu.el @ 90599:c358d0861b16
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 414-422)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 128-130)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-108
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 05 Sep 2006 02:54:22 +0000 |
parents | 8a8e69664178 c1a0f40d53a7 |
children | f1d13e615070 |
comparison
equal
deleted
inserted
replaced
90598:4a8681a3d827 | 90599:c358d0861b16 |
---|---|
965 (imenu-add-to-menubar "Index")) | 965 (imenu-add-to-menubar "Index")) |
966 | 966 |
967 (defvar imenu-buffer-menubar nil) | 967 (defvar imenu-buffer-menubar nil) |
968 | 968 |
969 (defvar imenu-menubar-modified-tick 0 | 969 (defvar imenu-menubar-modified-tick 0 |
970 "The value of (buffer-modified-tick) as of last call to `imenu-update-menubar'.") | 970 "The value of (buffer-chars-modified-tick) as of the last call |
971 to `imenu-update-menubar'.") | |
971 (make-variable-buffer-local 'imenu-menubar-modified-tick) | 972 (make-variable-buffer-local 'imenu-menubar-modified-tick) |
972 | 973 |
973 (defun imenu-update-menubar () | 974 (defun imenu-update-menubar () |
974 (when (and (current-local-map) | 975 (when (and (current-local-map) |
975 (keymapp (lookup-key (current-local-map) [menu-bar index])) | 976 (keymapp (lookup-key (current-local-map) [menu-bar index])) |
976 (not (eq (buffer-modified-tick) | 977 (/= (buffer-chars-modified-tick) imenu-menubar-modified-tick)) |
977 imenu-menubar-modified-tick))) | 978 (setq imenu-menubar-modified-tick (buffer-chars-modified-tick)) |
978 (setq imenu-menubar-modified-tick (buffer-modified-tick)) | |
979 (let ((index-alist (imenu--make-index-alist t))) | 979 (let ((index-alist (imenu--make-index-alist t))) |
980 ;; Don't bother updating if the index-alist has not changed | 980 ;; Don't bother updating if the index-alist has not changed |
981 ;; since the last time we did it. | 981 ;; since the last time we did it. |
982 (unless (equal index-alist imenu--last-menubar-index-alist) | 982 (unless (equal index-alist imenu--last-menubar-index-alist) |
983 (let (menu menu1 old) | 983 (let (menu menu1 old) |