mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

(battery-linux-proc-apm): Fix typo in docstring.

Browse Source 
Catch errors with ignore-errors.  Use temporary buffer.
(battery-linux-proc-acpi): Fix typo in docstring.  Document `%r'.
This commit is contained in:
Lute Kamstra 2005-07-01 11:03:19 +00:00
parent b97c98ad01
commit 12d6b12433
2 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,5 +1,9 @@
2005-07-01 Lute Kamstra <lute@gnu.org>
* battery.el (battery-linux-proc-apm): Fix typo in docstring.
Catch errors with ignore-errors. Use temporary buffer.
(battery-linux-proc-acpi): Fix typo in docstring. Document `%r'.
* facemenu.el (facemenu-unlisted-faces): Delete foreground and
background color faces.
(facemenu-set-foreground, facemenu-set-background): Use

81
lisp/battery.el
View File

@ -171,53 +171,49 @@ The following %-sequences are provided:
%B Battery status (verbose)
%b Battery status, empty means high, `-' means low,
`!' means critical, and `+' means charging
%p battery load percentage
%p Battery load percentage
%s Remaining time in seconds
%m Remaining time in minutes
%h Remaining time in hours
%t Remaining time in the form `h:min'"
(let (driver-version bios-version bios-interface line-status
battery-status battery-status-symbol load-percentage
seconds minutes hours remaining-time buffer tem)
(unwind-protect
(save-excursion
(setq buffer (get-buffer-create " *battery*"))
(set-buffer buffer)
(erase-buffer)
(insert-file-contents "/proc/apm")
(re-search-forward battery-linux-proc-apm-regexp)
(setq driver-version (match-string 1))
(setq bios-version (match-string 2))
(setq tem (string-to-number (match-string 3) 16))
(if (not (logand tem 2))
(setq bios-interface "not supported")
(setq bios-interface "enabled")
(cond ((logand tem 16) (setq bios-interface "disabled"))
((logand tem 32) (setq bios-interface "disengaged")))
(setq tem (string-to-number (match-string 4) 16))
(cond ((= tem 0) (setq line-status "off-line"))
((= tem 1) (setq line-status "on-line"))
((= tem 2) (setq line-status "on backup")))
(setq tem (string-to-number (match-string 6) 16))
(if (= tem 255)
(setq battery-status "N/A")
(setq tem (string-to-number (match-string 5) 16))
(cond ((= tem 0) (setq battery-status "high"
battery-status-symbol ""))
((= tem 1) (setq battery-status "low"
battery-status-symbol "-"))
((= tem 2) (setq battery-status "critical"
battery-status-symbol "!"))
((= tem 3) (setq battery-status "charging"
battery-status-symbol "+")))
(setq load-percentage (match-string 7))
(setq seconds (string-to-number (match-string 8)))
(and (string-equal (match-string 9) "min")
(setq seconds (* 60 seconds)))
(setq minutes (/ seconds 60)
hours (/ seconds 3600))
(setq remaining-time
(format "%d:%02d" hours (- minutes (* 60 hours))))))))
seconds minutes hours remaining-time tem)
(with-temp-buffer
(ignore-errors (insert-file-contents "/proc/apm"))
(when (re-search-forward battery-linux-proc-apm-regexp)
(setq driver-version (match-string 1))
(setq bios-version (match-string 2))
(setq tem (string-to-number (match-string 3) 16))
(if (not (logand tem 2))
(setq bios-interface "not supported")
(setq bios-interface "enabled")
(cond ((logand tem 16) (setq bios-interface "disabled"))
((logand tem 32) (setq bios-interface "disengaged")))
(setq tem (string-to-number (match-string 4) 16))
(cond ((= tem 0) (setq line-status "off-line"))
((= tem 1) (setq line-status "on-line"))
((= tem 2) (setq line-status "on backup")))
(setq tem (string-to-number (match-string 6) 16))
(if (= tem 255)
(setq battery-status "N/A")
(setq tem (string-to-number (match-string 5) 16))
(cond ((= tem 0) (setq battery-status "high"
battery-status-symbol ""))
((= tem 1) (setq battery-status "low"
battery-status-symbol "-"))
((= tem 2) (setq battery-status "critical"
battery-status-symbol "!"))
((= tem 3) (setq battery-status "charging"
battery-status-symbol "+")))
(setq load-percentage (match-string 7))
(setq seconds (string-to-number (match-string 8)))
(and (string-equal (match-string 9) "min")
(setq seconds (* 60 seconds)))
(setq minutes (/ seconds 60)
hours (/ seconds 3600))
(setq remaining-time
(format "%d:%02d" hours (- minutes (* 60 hours))))))))
(list (cons ?v (or driver-version "N/A"))
(cons ?V (or bios-version "N/A"))
(cons ?I (or bios-interface "N/A"))
@ -240,12 +236,13 @@ in Linux version 2.4.20 and 2.6.0.
The following %-sequences are provided:
%c Current capacity (mAh)
%r Current rate
%B Battery status (verbose)
%b Battery status, empty means high, `-' means low,
`!' means critical, and `+' means charging
%d Temperature (in degrees Celsius)
%L AC line status (verbose)
%p battery load percentage
%p Battery load percentage
%m Remaining time in minutes
%h Remaining time in hours
%t Remaining time in the form `h:min'"