(backquote-unquote-symbol, backquote-splice-symbol):

[gnu-emacs] / lisp / battery.el

diff --git a/lisp/battery.el b/lisp/battery.el
index a4c72df0bbb910d4d184b256a01aabb0f92d56a4..e1dbc1835575b5510d29ec2252680be6ef482dc6 100644 (file)
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -1,7 +1,7 @@
 ;;; battery.el --- display battery status information
 
 ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
 ;; Keywords: hardware
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -357,15 +357,17 @@ The following %-sequences are provided:
     (list (cons ?c (or (and capacity (number-to-string capacity)) "N/A"))
          (cons ?L (or (battery-search-for-one-match-in-files
                        (mapcar (lambda (e) (concat e "/state"))
-                               (directory-files "/proc/acpi/ac_adapter/"
-                                                t "\\`[^.]"))
+                               (ignore-errors
+                                 (directory-files "/proc/acpi/ac_adapter/"
+                                                  t "\\`[^.]")))
                        "state: +\\(.*\\)$" 1)
 
                       "N/A"))
          (cons ?d (or (battery-search-for-one-match-in-files
                        (mapcar (lambda (e) (concat e "/temperature"))
-                               (directory-files "/proc/acpi/thermal_zone/"
-                                                t "\\`[^.]"))
+                               (ignore-errors
+                                 (directory-files "/proc/acpi/thermal_zone/"
+                                                  t "\\`[^.]")))
                        "temperature: +\\([0-9]+\\) C$" 1)
 
                       "N/A"))
@@ -455,7 +457,7 @@ The following %-sequences are provided:
 
 (defun battery-search-for-one-match-in-files (files regexp match-num)
   "Search REGEXP in the content of the files listed in FILES.
-If a match occured, return the parenthesized expression numbered by
+If a match occurred, return the parenthesized expression numbered by
 MATCH-NUM in the match.  Otherwise, return nil."
   (with-temp-buffer
     (catch 'found