From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: michael@cadilhac.name (=?iso-8859-1?Q?Micha=EBl?= Cadilhac) Newsgroups: gmane.emacs.devel Subject: Re: Proposal for battery.el Date: Sat, 04 Nov 2006 18:41:21 +0100 Organization: Epita/LRDE Message-ID: <877iybm7ni.fsf@lrde.org> References: <87lkmwpjjn.fsf@lrde.org> <87u01hy0bk.fsf@lrde.org> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1291685075==" X-Trace: sea.gmane.org 1162662120 25368 80.91.229.2 (4 Nov 2006 17:42:00 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 4 Nov 2006 17:42:00 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 04 18:41:52 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1GgPWR-0007tI-8o for ged-emacs-devel@m.gmane.org; Sat, 04 Nov 2006 18:41:37 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GgPWQ-0000BZ-Px for ged-emacs-devel@m.gmane.org; Sat, 04 Nov 2006 12:41:34 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1GgPWD-00007q-5n for emacs-devel@gnu.org; Sat, 04 Nov 2006 12:41:21 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1GgPW5-00005K-04 for emacs-devel@gnu.org; Sat, 04 Nov 2006 12:41:20 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GgPW4-00005H-TP for emacs-devel@gnu.org; Sat, 04 Nov 2006 12:41:12 -0500 Original-Received: from [62.39.139.2] (helo=kualalumpur.lrde.epita.fr) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1GgPVz-00054u-1A; Sat, 04 Nov 2006 12:41:07 -0500 Original-Received: from mahaena.lrde.epita.fr ([192.168.101.66] helo=mahaena.lrde) by kualalumpur.lrde.epita.fr with esmtp (Exim 4.50) id 1GgPVv-0002gO-Va; Sat, 04 Nov 2006 18:41:04 +0100 Original-To: rms@gnu.org Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAElBMVEU/JREXDATg1LV8UCao i1fQpmoP3Nd6AAACa0lEQVQ4jWWUQW7jMAxFqZEPICJzAjXeM6W8dyNqX9ji/a8yn04xnWIEJLD9 LJH85DcJFyJV3erqPty8ExHfBikXSdn0WVezC0hOAQiA2nCsAHOqEnPe4k+puU8zw/t+xquqjRKA 4lHsmQBT8C5pDtBwfwH8VdcHI5+FHtjRxrQRwZsf3hNjZRKAPEzHEdH9mFNSYb5dQK3r8KM6ftNy KikAirDZFWdVkDqbxjGFbAcwbQCxxc8mPRHUGOcCIMgMACV23RfJTch3gC6ofT3qCdG0NyUUPfYF yQrKCIAnuYsgX2qPzW2i9sNrfSOSPPZQiygtCNlCjlpXJV38lIKshF/AZzsAMoArdCKNHfXukPuJ ImbLh+9J2gXwap0QpZ7NjZ7ekdkFcDiqPiLGcHmuvaG/AHgy62s52Lae1ABoA7D6d2kDoAvgbnyD ZutEd6lTHOXfYPHVJDH1K8a1+oyrjoZpAGn1x5pfwPr2E9yjxSpk50/gEyKgD/+BD/KzN3tQ13b8 Cx5loF0AgnZf5IUny9hRHQOYBllHDM+6s3oviZBu77mFjDm621Np3hkjR90wE1BkTYvhdDgDgCmR xWChFfcYAOqMm5NZkVWMur8AL5+oeMQOob2FmY76FiM+PrDDZypwGdqokSlAaQOmGH6mW8KpsOwl 0YOLedjSITr6scNRF8D4PesH33QmLrx8AzjpV/3kkg025w2gfAFYKCLluJAc4Ap+h18oo4S8wzaY klDsBUTiY8EZFkg5Iass75FubC9wd8qa0u9+gRxAsAKEaRAo6iB+vwCMGmdBjvgidQGA1ntMX4CS ZYGV/wADyL80LIX/UAAAAABJRU5ErkJggg== In-Reply-To: (Richard Stallman's message of "Sat\, 04 Nov 2006 01\:36\:50 -0500") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.0.90 (gnu/linux) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:61786 Archived-At: --===============1291685075== Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Richard Stallman writes: > + (defun battery-search-for-one-match-in-files (files regexp match-num) > + "Search REGEXP in the list of files FILES. > + Return the parenthesized expression numbered by MATCH-NUM." > > It does need to say that (1) it matches the _contents_ of the files, > and (2) that it returns nil if there is no match. > With that change, it seems good. Fair enough ! Attached. --=-=-= Content-Type: text/x-patch; charset=iso-8859-1 Content-Disposition: attachment; filename=battery.patch Content-Transfer-Encoding: quoted-printable Index: lisp/battery.el =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /sources/emacs/emacs/lisp/battery.el,v retrieving revision 1.36 diff -c -r1.36 battery.el *** lisp/battery.el 9 May 2006 22:43:35 -0000 1.36 =2D-- lisp/battery.el 2 Nov 2006 21:56:48 -0000 *************** *** 355,399 **** 60))) hours (/ minutes 60))) (list (cons ?c (or (and capacity (number-to-string capacity)) "N/A")) ! (cons ?L (or (when (file-exists-p "/proc/acpi/ac_adapter/AC/state") ! (with-temp-buffer ! (insert-file-contents ! "/proc/acpi/ac_adapter/AC/state") ! (when (re-search-forward "state: +\\(.*\\)$" nil t) ! (match-string 1)))) "N/A")) ! (cons ?d (or (when (file-exists-p ! "/proc/acpi/thermal_zone/THRM/temperature") ! (with-temp-buffer ! (insert-file-contents ! "/proc/acpi/thermal_zone/THRM/temperature") ! (when (re-search-forward ! "temperature: +\\([0-9]+\\) C$" nil t) ! (match-string 1)))) ! (when (file-exists-p ! "/proc/acpi/thermal_zone/THM/temperature") ! (with-temp-buffer ! (insert-file-contents ! "/proc/acpi/thermal_zone/THM/temperature") ! (when (re-search-forward ! "temperature: +\\([0-9]+\\) C$" nil t) ! (match-string 1)))) ! (when (file-exists-p ! "/proc/acpi/thermal_zone/THM0/temperature") ! (with-temp-buffer ! (insert-file-contents ! "/proc/acpi/thermal_zone/THM0/temperature") ! (when (re-search-forward ! "temperature: +\\([0-9]+\\) C$" nil t) ! (match-string 1)))) ! (when (file-exists-p ! "/proc/acpi/thermal_zone/THR2/temperature") ! (with-temp-buffer ! (insert-file-contents ! "/proc/acpi/thermal_zone/THR2/temperature") ! (when (re-search-forward ! "temperature: +\\([0-9]+\\) C$" nil t) ! (match-string 1)))) "N/A")) (cons ?r (or (and rate (concat (number-to-string rate) " " rate-type)) "N/A")) =2D-- 355,373 ---- 60))) hours (/ minutes 60))) (list (cons ?c (or (and capacity (number-to-string capacity)) "N/A")) ! (cons ?L (or (battery-search-for-one-match-in-files ! (mapcar (lambda (e) (concat e "/state")) ! (directory-files "/proc/acpi/ac_adapter/" ! t "\\`[^.]")) ! "state: +\\(.*\\)$" 1) !=20 "N/A")) ! (cons ?d (or (battery-search-for-one-match-in-files ! (mapcar (lambda (e) (concat e "/temperature")) ! (directory-files "/proc/acpi/thermal_zone/" ! t "\\`[^.]")) ! "temperature: +\\([0-9]+\\) C$" 1) !=20 "N/A")) (cons ?r (or (and rate (concat (number-to-string rate) " " rate-type)) "N/A")) *************** *** 478,483 **** =2D-- 452,471 ---- (or (cdr (assoc char alist)) "")))) format t t)) =20=20 + (defun battery-search-for-one-match-in-files (files regexp match-num) + "Search REGEXP in content of the files listed in FILES. + If a match occured, return the parenthesized expression numbered by + MATCH-NUM in the match. Otherwise, return nil." + (with-temp-buffer + (while (and files + (not (or (ignore-errors + (insert-file-contents (car files)) + (re-search-forward regexp)) + (erase-buffer)))) + (setq files (cdr files))) + (when files + (match-string match-num)))) +=20 (provide 'battery) =20=20 Index: lisp/ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /sources/emacs/emacs/lisp/ChangeLog,v retrieving revision 1.10237 diff -c -0 -r1.10237 ChangeLog *** lisp/ChangeLog 31 Oct 2006 11:07:10 -0000 1.10237 =2D-- lisp/ChangeLog 2 Nov 2006 21:56:57 -0000 *************** *** 0 **** =2D-- 1,8 ---- + 2006-11-04 Micha=EBl Cadilhac +=20 + * battery.el (battery-linux-proc-acpi): Search an ac_adapter in + `/proc/acpi/ac_adapter/*'. Ditto for the thermometers in + `/proc/acpi/thermal_zone/*'. + (battery-search-for-one-match-in-files): New. Search a regexp in + a list of files. +=20 --=-=-= Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable > Please install it. Please someone do! TIA! =2D-=20 /!\ My mail address changed, please update your files accordingly. | Micha=EBl `Micha' Cadilhac | La culture c'est comme la confiture= , | | Epita/LRDE Promo 2007 | c'est meilleur avec du pain. = | | http://michael.cadilhac.name | -- MOI59 = | `-- - JID: micha@amessage.be --' - -= -' --=-=-=-- --==-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQFFTNDFUJhDmOfFA3URAm21AJ4sUq/VNarx2XbKoTl4ev95UQgqEwCdHGU1 ygmmuf9S7CB719Tl2eFAwTI= =WQMK -----END PGP SIGNATURE----- --==-=-=-- --===============1291685075== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-devel --===============1291685075==--