Restore window-safely-shrinkable-p but avoid using it in calendar.el.

[gnu-emacs] / lisp / battery.el

diff --git a/lisp/battery.el b/lisp/battery.el
index 0b7407274f8c63705b2be0404d65eadd3bccad85..9afe9de7b983a09b557acd599f969c37f88ec700 100644 (file)
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -1,7 +1,6 @@
 ;;; battery.el --- display battery status information  -*- coding: iso-8859-1 -*-
 
-;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2011 Free Software Foundation, Inc.
 
 ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
 ;; Keywords: hardware
@@ -60,7 +59,7 @@
         'battery-pmset)
        ((eq system-type 'windows-nt)
         'w32-battery-status))
-  "*Function for getting battery status information.
+  "Function for getting battery status information.
 The function has to return an alist of conversion definitions.
 Its cons cells are of the form
 
@@ -80,7 +79,7 @@ introduced by a `%' character in a control string."
         "%L power, battery %B (%p%% load, remaining time %t)")
        (battery-status-function
         "Power %L, battery %B (%p%% load, remaining time %t)"))
-  "*Control string formatting the string to display in the echo area.
+  "Control string formatting the string to display in the echo area.
 Ordinary characters in the control string are printed as-is, while
 conversion specifications introduced by a `%' character in the control
 string are substituted as defined by the current value of the variable
@@ -108,7 +107,7 @@ string are substituted as defined by the current value of the variable
         "[%b%p%%,%d°C]")
        (battery-status-function
         "[%b%p%%]"))
-  "*Control string formatting the string to display in the mode line.
+  "Control string formatting the string to display in the mode line.
 Ordinary characters in the control string are printed as-is, while
 conversion specifications introduced by a `%' character in the control
 string are substituted as defined by the current value of the variable
@@ -128,18 +127,18 @@ string are substituted as defined by the current value of the variable
   :group 'battery)
 
 (defcustom battery-update-interval 60
-  "*Seconds after which the battery status will be updated."
+  "Seconds after which the battery status will be updated."
   :type 'integer
   :group 'battery)
 
 (defcustom battery-load-low 25
-  "*Upper bound of low battery load percentage.
+  "Upper bound of low battery load percentage.
 A battery load percentage below this number is considered low."
   :type 'integer
   :group 'battery)
 
 (defcustom battery-load-critical 10
-  "*Upper bound of critical battery load percentage.
+  "Upper bound of critical battery load percentage.
 A battery load percentage below this number is considered critical."
   :type 'integer
   :group 'battery)
@@ -553,5 +552,4 @@ MATCH-NUM in the match.  Otherwise, return nil."
 \f
 (provide 'battery)
 
-;; arch-tag: 65916f50-4754-4b6b-ac21-0b510f545a37
 ;;; battery.el ends here