Mercurial > emacs
comparison lisp/battery.el @ 90140:02f1dbc4a199
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 228-240)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 53-58)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Collapse feature addition/removal within single ChangeLog entry
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 09 Apr 2005 02:16:29 +0000 |
| parents | cb67264d6096 abd0d265b4ba |
| children | f9a65d7ebd29 |
comparison
equal
deleted
inserted
replaced
| 90139:e0d294b9b23e | 90140:02f1dbc4a199 |
|---|---|
| 112 "Display battery status information in the mode line. | 112 "Display battery status information in the mode line. |
| 113 The text being displayed in the mode line is controlled by the variables | 113 The text being displayed in the mode line is controlled by the variables |
| 114 `battery-mode-line-format' and `battery-status-function'. | 114 `battery-mode-line-format' and `battery-status-function'. |
| 115 The mode line will be updated automatically every `battery-update-interval' | 115 The mode line will be updated automatically every `battery-update-interval' |
| 116 seconds." | 116 seconds." |
| 117 :global t | 117 :global t :group 'battery |
| 118 (setq battery-mode-line-string "") | 118 (setq battery-mode-line-string "") |
| 119 (or global-mode-string (setq global-mode-string '(""))) | 119 (or global-mode-string (setq global-mode-string '(""))) |
| 120 (and battery-update-timer (cancel-timer battery-update-timer)) | 120 (and battery-update-timer (cancel-timer battery-update-timer)) |
| 121 (if (not display-battery-mode) | 121 (if (not display-battery-mode) |
| 122 (setq global-mode-string | 122 (setq global-mode-string |