From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#9363: display-battery-mode Date: Wed, 24 Aug 2011 21:12:08 +0300 Organization: JURTA Message-ID: <874o16el1j.fsf@mail.jurta.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1314209797 8173 80.91.229.12 (24 Aug 2011 18:16:37 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 24 Aug 2011 18:16:37 +0000 (UTC) To: 9363@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Aug 24 20:16:33 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QwI08-0008LH-V3 for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Aug 2011 20:16:33 +0200 Original-Received: from localhost ([::1]:55189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwI08-0007Y1-A8 for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Aug 2011 14:16:32 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:51768) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwI05-0007WT-DT for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2011 14:16:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwI04-0007xG-Cr for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2011 14:16:29 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:50222) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwI04-0007xB-A3 for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2011 14:16:28 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1QwI2Y-0008Kb-Fx; Wed, 24 Aug 2011 14:19:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 24 Aug 2011 18:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 9363 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.131420993532008 (code B ref -1); Wed, 24 Aug 2011 18:19:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 24 Aug 2011 18:18:55 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QwI2R-0008KD-Je for submit@debbugs.gnu.org; Wed, 24 Aug 2011 14:18:55 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QwI2P-0008K6-DB for submit@debbugs.gnu.org; Wed, 24 Aug 2011 14:18:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwHzt-0007vn-SC for submit@debbugs.gnu.org; Wed, 24 Aug 2011 14:16:18 -0400 Original-Received: from lists.gnu.org ([140.186.70.17]:41165) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwHzt-0007vg-Qi for submit@debbugs.gnu.org; Wed, 24 Aug 2011 14:16:17 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:51714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwHzs-0007UT-NK for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2011 14:16:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwHzr-0007vO-MC for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2011 14:16:16 -0400 Original-Received: from smarty.dreamhost.com ([208.113.175.8]:54524) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwHzr-0007vB-Br for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2011 14:16:15 -0400 Original-Received: from ps18281.dreamhostps.com (ps18281.dreamhost.com [69.163.218.105]) by smarty.dreamhost.com (Postfix) with ESMTP id 6097E6E80BB for ; Wed, 24 Aug 2011 11:16:14 -0700 (PDT) Original-Received: from localhost (ps18281.dreamhostps.com [69.163.218.105]) by ps18281.dreamhostps.com (Postfix) with ESMTP id BFD79451C28D for ; Wed, 24 Aug 2011 11:16:13 -0700 (PDT) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (x86_64-pc-linux-gnu) 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.11 Precedence: list Resent-Date: Wed, 24 Aug 2011 14:19:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 1) 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:50303 Archived-At: When ACPI is turned off with `acpi=off' after booting the Linux kernel `M-x display-battery-mode RET' fails with: Debugger entered--Lisp error: (wrong-type-argument stringp nil) read-from-string(nil) battery-update() display-battery-mode(toggle) call-interactively(display-battery-mode t nil) execute-extended-command(nil) call-interactively(execute-extended-command nil nil) whereas `M-x battery RET' displays a polite message "Battery status not available". This patch fixes `display-battery-mode' to display the same message when `battery-status-function' is nil. I don't know if it's desirable to force turning off this mode and to reset the value of `display-battery-mode' to nil in this case. But at least, the message is informative with this patch: === modified file 'lisp/battery.el' --- lisp/battery.el 2011-06-27 08:04:55 +0000 +++ lisp/battery.el 2011-08-24 18:11:15 +0000 @@ -173,13 +173,15 @@ (define-minor-mode display-battery-mode (setq battery-mode-line-string "") (or global-mode-string (setq global-mode-string '(""))) (and battery-update-timer (cancel-timer battery-update-timer)) - (if (not display-battery-mode) - (setq global-mode-string - (delq 'battery-mode-line-string global-mode-string)) - (add-to-list 'global-mode-string 'battery-mode-line-string t) - (setq battery-update-timer (run-at-time nil battery-update-interval - 'battery-update-handler)) - (battery-update))) + (if (and battery-status-function battery-mode-line-format) + (if (not display-battery-mode) + (setq global-mode-string + (delq 'battery-mode-line-string global-mode-string)) + (add-to-list 'global-mode-string 'battery-mode-line-string t) + (setq battery-update-timer (run-at-time nil battery-update-interval + 'battery-update-handler)) + (battery-update)) + (message "Battery status not available"))) (defun battery-update-handler () (battery-update)