1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-24 10:38:38 +00:00

(timeclock-modeline-display): Use assq as well as memq to find

`global-mode-string' within `mode-line-format'.  The structure of
that variable has changed in 21.3.
This commit is contained in:
John Wiegley 2002-11-08 20:28:55 +00:00
parent 4c302ba42e
commit dc0868e1ce

View File

@ -273,13 +273,13 @@ positive. Returns the new status of timeclock modeline display
(> (prefix-numeric-value arg) 0)
(not timeclock-modeline-display))))
(if on-p
(let ((list-entry (memq 'global-mode-string
mode-line-format)))
(let ((list-entry (or (memq 'global-mode-string mode-line-format)
;; In Emacs 21.3 we must use assq
(assq 'global-mode-string mode-line-format))))
(unless (or (null list-entry)
(memq 'timeclock-mode-string mode-line-format))
(setcdr list-entry
(cons 'timeclock-mode-string
(cdr list-entry))))
(setcdr list-entry (cons 'timeclock-mode-string
(cdr list-entry))))
(unless (memq 'timeclock-update-modeline timeclock-event-hook)
(add-hook 'timeclock-event-hook 'timeclock-update-modeline))
(when timeclock-update-timer