comparison lisp/battery.el @ 90072:cb67264d6096

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-2 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-83 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-84 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-3 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-4 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-5 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-6 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-11 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-12 Remove "-face" suffix from lazy-highlight face name * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-13 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-16 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-17 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-18 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-21 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-22 <no summary provided> * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-23 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-39 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-40 Fix regressions from latest reftex update * miles@gnu.org--gnu-2005/gnus--rel--5.10--base-0 tag of miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-1 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-2 Merge from miles@gnu.org--gnu-2004 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-3 Merge from emacs--cvs-trunk--0
author Miles Bader <miles@gnu.org>
date Sun, 16 Jan 2005 03:40:12 +0000
parents 95879cc1ed20 9120644ff426
children 02f1dbc4a199
comparison
equal deleted inserted replaced
90071:f6b4d0ebf147 90072:cb67264d6096
1 ;;; battery.el --- display battery status information 1 ;;; battery.el --- display battery status information
2 2
3 ;; Copyright (C) 1997, 1998, 2000, 2001, 2003, 2004 3 ;; Copyright (C) 1997, 1998, 2000, 2001, 2003, 2004, 2005
4 ;; Free Software Foundation, Inc. 4 ;; Free Software Foundation, Inc.
5 5
6 ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org> 6 ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
7 ;; Keywords: hardware 7 ;; Keywords: hardware
8 8
106 (battery-format battery-echo-area-format 106 (battery-format battery-echo-area-format
107 (funcall battery-status-function)) 107 (funcall battery-status-function))
108 "Battery status not available"))) 108 "Battery status not available")))
109 109
110 ;;;###autoload 110 ;;;###autoload
111 (defun display-battery () 111 (define-minor-mode display-battery-mode
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 (interactive) 117 :global t
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 (add-to-list 'global-mode-string 'battery-mode-line-string t)
121 (and battery-update-timer (cancel-timer battery-update-timer)) 120 (and battery-update-timer (cancel-timer battery-update-timer))
122 (setq battery-update-timer (run-at-time nil battery-update-interval 121 (if (not display-battery-mode)
123 'battery-update-handler)) 122 (setq global-mode-string
124 (battery-update)) 123 (delq 'battery-mode-line-string global-mode-string))
124 (add-to-list 'global-mode-string 'battery-mode-line-string t)
125 (setq battery-update-timer (run-at-time nil battery-update-interval
126 'battery-update-handler))
127 (battery-update)))
125 128
126 (defun battery-update-handler () 129 (defun battery-update-handler ()
127 (battery-update) 130 (battery-update)
128 (sit-for 0)) 131 (sit-for 0))
129 132