# HG changeset patch
# User Lute Kamstra <lute@gnu.org>
# Date 1123767096 0
# Node ID 777c4aaf636a94e05f5750843af843efbf5efec4
# Parent  45df3993d9509f9761a136988643492a60f3a6db
*** empty log message ***

diff -r 45df3993d950 -r 777c4aaf636a lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Aug 11 13:29:29 2005 +0000
+++ b/lisp/ChangeLog	Thu Aug 11 13:31:36 2005 +0000
@@ -1,3 +1,12 @@
+2005-08-11  Richard M. Stallman  <rms@gnu.org>
+
+	* battery.el (battery-status-function): Don't use ignore-errors.
+
+2005-08-11  Lute Kamstra  <lute@gnu.org>
+
+	* emacs-lisp/generic.el (generic-font-lock-defaults): Declare with
+	define-obsolete-variable-alias.
+
 2005-08-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* net/ange-ftp.el: Use \\` and \\' instead of ^ and $ in regexps.