# HG changeset patch # User Alex Schroeder # Date 1063223461 0 # Node ID b4d15685afef4ad347efe784ce9bf0daea10f6f3 # Parent 88758cad101289f415df5a5c0b585cf29af7deb3 2003-09-10 Mario Lang Update Commentary and Copyright. (battery-linux-proc-acpi): Fix a bug in %b which made "!" never appear due to wrong ordering of the expressions in `or'. diff -r 88758cad1012 -r b4d15685afef lisp/battery.el --- a/lisp/battery.el Mon Sep 08 19:01:57 2003 +0000 +++ b/lisp/battery.el Wed Sep 10 19:51:01 2003 +0000 @@ -1,6 +1,6 @@ ;;; battery.el --- display battery status information -;; Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2000, 2001, 2003 Free Software Foundation, Inc. ;; Author: Ralph Schleicher ;; Keywords: hardware @@ -24,9 +24,9 @@ ;;; Commentary: -;; There is at present only a function interpreting the new `/proc/apm' -;; file format of Linux version 1.3.58 or newer. That is, what a lucky -;; coincidence, exactly the interface provided by the author's laptop. +;; There is at present support for interpreting the new `/proc/apm' +;; file format of Linux version 1.3.58 or newer and for the `/proc/acpi/' +;; directory structure of Linux 2.4.20 and 2.6. ;;; Code: @@ -308,8 +308,8 @@ (cons ?r (or (and rate (number-to-string rate)) "N/A")) (cons ?B (or charging-state "N/A")) (cons ?b (or (and (string= charging-state "charging") "+") + (and low (< capacity low) "!") (and warn (< capacity warn) "-") - (and low (< capacity low) "!") "")) (cons ?h (or (and hours (number-to-string hours)) "N/A")) (cons ?m (or (and minutes (number-to-string minutes)) "N/A"))