[Emacs-diffs] Changes to emacs/lisp/battery.el

[Alex Schroeder]

Index: emacs/lisp/battery.el
diff -c emacs/lisp/battery.el:1.17 emacs/lisp/battery.el:1.18
*** emacs/lisp/battery.el:1.17  Sat Sep  6 15:28:08 2003
--- emacs/lisp/battery.el       Wed Sep 10 15:51:01 2003
***************
*** 1,6 ****
  ;;; battery.el --- display battery status information
  
! ;; Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
  
  ;; Author: Ralph Schleicher <address@hidden>
  ;; Keywords: hardware
--- 1,6 ----
  ;;; battery.el --- display battery status information
  
! ;; Copyright (C) 1997, 1998, 2000, 2001, 2003 Free Software Foundation, Inc.
  
  ;; Author: Ralph Schleicher <address@hidden>
  ;; Keywords: hardware
***************
*** 24,32 ****
  
  ;;; 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.
  
  ;;; Code:
  
--- 24,32 ----
  
  ;;; Commentary:
  
! ;; 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,315 ****
          (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 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"))
--- 308,315 ----
          (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) "-")
                       ""))
          (cons ?h (or (and hours (number-to-string hours)) "N/A"))
          (cons ?m (or (and minutes (number-to-string minutes)) "N/A"))