From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 14 Aug 2004 12:21:03 +0000 (+0000)
Subject: (battery-linux-proc-acpi): Look into battery
X-Git-Tag: ttn-vms-21-2-B4~5295
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bed6d708744793275ccb9daf258e6c6a6a1618b0;p=emacs.git

(battery-linux-proc-acpi): Look into battery
directories matching the literal string "CMB", too (required for
Linux kernel version 2.6.7).
---

diff --git a/lisp/battery.el b/lisp/battery.el
index 73d78067571..3b44ff891f9 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -290,7 +290,7 @@ The following %-sequences are provided:
 				      nil t)
 	       (setq low (+ (or low 0)
 			    (string-to-int (match-string 1))))))))
-       (directory-files "/proc/acpi/battery/" t "BAT")))
+       (directory-files "/proc/acpi/battery/" t "\\(BAT\\|CMB\\)")))
     (and capacity rate
 	 (setq minutes (if (zerop rate) 0
 			 (floor (* (/ (float (if (string= charging-state