mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-17 03:10:58 -08:00
Code Issues Projects Releases Wiki 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
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> 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 * facemenu.el (facemenu-unlisted-faces): Delete foreground and
background color faces. background color faces.
(facemenu-set-foreground, facemenu-set-background): Use (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 (verbose)
%b Battery status, empty means high, `-' means low, %b Battery status, empty means high, `-' means low,
`!' means critical, and `+' means charging `!' means critical, and `+' means charging
%p battery load percentage %p Battery load percentage
%s Remaining time in seconds %s Remaining time in seconds
%m Remaining time in minutes %m Remaining time in minutes
%h Remaining time in hours %h Remaining time in hours
%t Remaining time in the form `h:min'" %t Remaining time in the form `h:min'"
(let (driver-version bios-version bios-interface line-status (let (driver-version bios-version bios-interface line-status
battery-status battery-status-symbol load-percentage battery-status battery-status-symbol load-percentage
seconds minutes hours remaining-time buffer tem) seconds minutes hours remaining-time tem)
(unwind-protect (with-temp-buffer
(save-excursion (ignore-errors (insert-file-contents "/proc/apm"))
(setq buffer (get-buffer-create " *battery*")) (when (re-search-forward battery-linux-proc-apm-regexp)
(set-buffer buffer) (setq driver-version (match-string 1))
(erase-buffer) (setq bios-version (match-string 2))
(insert-file-contents "/proc/apm") (setq tem (string-to-number (match-string 3) 16))
(re-search-forward battery-linux-proc-apm-regexp) (if (not (logand tem 2))
(setq driver-version (match-string 1)) (setq bios-interface "not supported")
(setq bios-version (match-string 2)) (setq bios-interface "enabled")
(setq tem (string-to-number (match-string 3) 16)) (cond ((logand tem 16) (setq bios-interface "disabled"))
(if (not (logand tem 2)) ((logand tem 32) (setq bios-interface "disengaged")))
(setq bios-interface "not supported") (setq tem (string-to-number (match-string 4) 16))
(setq bios-interface "enabled") (cond ((= tem 0) (setq line-status "off-line"))
(cond ((logand tem 16) (setq bios-interface "disabled")) ((= tem 1) (setq line-status "on-line"))
((logand tem 32) (setq bios-interface "disengaged"))) ((= tem 2) (setq line-status "on backup")))
(setq tem (string-to-number (match-string 4) 16)) (setq tem (string-to-number (match-string 6) 16))
(cond ((= tem 0) (setq line-status "off-line")) (if (= tem 255)
((= tem 1) (setq line-status "on-line")) (setq battery-status "N/A")
((= tem 2) (setq line-status "on backup"))) (setq tem (string-to-number (match-string 5) 16))
(setq tem (string-to-number (match-string 6) 16)) (cond ((= tem 0) (setq battery-status "high"
(if (= tem 255) battery-status-symbol ""))
(setq battery-status "N/A") ((= tem 1) (setq battery-status "low"
(setq tem (string-to-number (match-string 5) 16)) battery-status-symbol "-"))
(cond ((= tem 0) (setq battery-status "high" ((= tem 2) (setq battery-status "critical"
battery-status-symbol "")) battery-status-symbol "!"))
((= tem 1) (setq battery-status "low" ((= tem 3) (setq battery-status "charging"
battery-status-symbol "-")) battery-status-symbol "+")))
((= tem 2) (setq battery-status "critical" (setq load-percentage (match-string 7))
battery-status-symbol "!")) (setq seconds (string-to-number (match-string 8)))
((= tem 3) (setq battery-status "charging" (and (string-equal (match-string 9) "min")
battery-status-symbol "+"))) (setq seconds (* 60 seconds)))
(setq load-percentage (match-string 7)) (setq minutes (/ seconds 60)
(setq seconds (string-to-number (match-string 8))) hours (/ seconds 3600))
(and (string-equal (match-string 9) "min") (setq remaining-time
(setq seconds (* 60 seconds))) (format "%d:%02d" hours (- minutes (* 60 hours))))))))
(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")) (list (cons ?v (or driver-version "N/A"))
(cons ?V (or bios-version "N/A")) (cons ?V (or bios-version "N/A"))
(cons ?I (or bios-interface "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: The following %-sequences are provided:
%c Current capacity (mAh) %c Current capacity (mAh)
%r Current rate
%B Battery status (verbose) %B Battery status (verbose)
%b Battery status, empty means high, `-' means low, %b Battery status, empty means high, `-' means low,
`!' means critical, and `+' means charging `!' means critical, and `+' means charging
%d Temperature (in degrees Celsius) %d Temperature (in degrees Celsius)
%L AC line status (verbose) %L AC line status (verbose)
%p battery load percentage %p Battery load percentage
%m Remaining time in minutes %m Remaining time in minutes
%h Remaining time in hours %h Remaining time in hours
%t Remaining time in the form `h:min'" %t Remaining time in the form `h:min'"