From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.bugs Subject: bug#11269: battery.el does not display remaining time when using sysfs Date: Wed, 18 Apr 2012 02:37:21 -0400 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1334731096 15287 80.91.229.3 (18 Apr 2012 06:38:16 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 18 Apr 2012 06:38:16 +0000 (UTC) To: 11269@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Apr 18 08:38:15 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SKOWr-0002t4-JL for geb-bug-gnu-emacs@m.gmane.org; Wed, 18 Apr 2012 08:38:13 +0200 Original-Received: from localhost ([::1]:44489 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKOWq-0005El-PO for geb-bug-gnu-emacs@m.gmane.org; Wed, 18 Apr 2012 02:38:12 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:49475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKOWj-0005E9-8D for bug-gnu-emacs@gnu.org; Wed, 18 Apr 2012 02:38:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKOWh-0000PD-CZ for bug-gnu-emacs@gnu.org; Wed, 18 Apr 2012 02:38:04 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:38155) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKOWh-0000P9-91 for bug-gnu-emacs@gnu.org; Wed, 18 Apr 2012 02:38:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1SKOWs-0006aa-Ct for bug-gnu-emacs@gnu.org; Wed, 18 Apr 2012 02:38:14 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dan Nicolaescu Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 18 Apr 2012 06:38:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 11269 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.133473108725308 (code B ref -1); Wed, 18 Apr 2012 06:38:11 +0000 Original-Received: (at submit) by debbugs.gnu.org; 18 Apr 2012 06:38:07 +0000 Original-Received: from localhost ([127.0.0.1]:39189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SKOWY-0006Zt-0X for submit@debbugs.gnu.org; Wed, 18 Apr 2012 02:37:56 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:35007) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SKOWS-0006ZY-DG for submit@debbugs.gnu.org; Wed, 18 Apr 2012 02:37:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKOW5-0008SV-JA for submit@debbugs.gnu.org; Wed, 18 Apr 2012 02:37:31 -0400 Original-Received: from lists.gnu.org ([208.118.235.17]:36188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKOW5-0008SO-Fm for submit@debbugs.gnu.org; Wed, 18 Apr 2012 02:37:25 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:49380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKOW3-0005Cj-Sn for bug-gnu-emacs@gnu.org; Wed, 18 Apr 2012 02:37:25 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKOW2-0008Rv-4w for bug-gnu-emacs@gnu.org; Wed, 18 Apr 2012 02:37:23 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:43245) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKOW2-0008Rr-1t for bug-gnu-emacs@gnu.org; Wed, 18 Apr 2012 02:37:22 -0400 Original-Received: from dann by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1SKOW1-0006oJ-E0 for bug-gnu-emacs@gnu.org; Wed, 18 Apr 2012 02:37:21 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:59201 Archived-At: After a kernel upgrade battery.el on a machine started using the sysfs backend instead of the acpi backend. That info displayed by default now is not very useful because it does not include "remaining time" like all the other backends do. I think this might be considered a regression, the display was more useful in the previous version than it is now. Here's a fix for that, and fix for the charge in a system with 2 batteries, when one of them is not in use. Please check this in the appropriate place. * battery.el (battery-echo-area-format): Display remaining time for the sysfs backend too. (battery-linux-sysfs): Fix conditional for the charge. === modified file 'lisp/battery.el' --- lisp/battery.el 2012-04-12 02:04:29 +0000 +++ lisp/battery.el 2012-04-16 16:29:43 +0000 @@ -78,7 +78,7 @@ introduced by a `%' character in a contr (cond ((eq battery-status-function 'battery-linux-proc-acpi) "Power %L, battery %B at %r (%p%% load, remaining time %t)") ((eq battery-status-function 'battery-linux-sysfs) - "Power %L, battery %B (%p%% load)") + "Power %L, battery %B (%p%% load, remaining time %t)") ((eq battery-status-function 'battery-pmset) "%L power, battery %B (%p%% load, remaining time %t)") (battery-status-function @@ -509,7 +509,7 @@ The following %-sequences are provided: "N/A")) (cons ?d (or temperature "N/A")) (cons ?B (or charging-state "N/A")) - (cons ?p (cond ((> charge-full 0) + (cons ?p (cond ((and (> charge-full 0) (> charge-now 0)) (format "%.1f" (/ (* 100 charge-now) charge-full))) ((> energy-full 0)