Add file cookie coding:iso-8859-1 for the degree sign

in battery-mode-line-format.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ffa1c9d92c86a0b84faf1d57bf9363da08894a8..780068ba8983ee662fa5a761bc6a9addb9e151f2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-25  Juri Linkov  <juri@jurta.org>
+
+       * battery.el: Add file cookie coding:iso-8859-1 for the degree sign
+       in battery-mode-line-format.
+
+       * bindings.el (minibuffer-local-map): For the command
+       file-cache-minibuffer-complete replace keymap minibuffer-local-map
+       with map which is already locally bound to minibuffer-local-map.
+
 2008-03-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * subr.el (map-keymap-sorted): Rename from map-keymap-internal.

diff --git a/lisp/battery.el b/lisp/battery.el
index 1871a8bfb74338b8cb3f8b9a26f009faa00ba24d..0fff947fc76a542a98271b249977b89fcaee8a25 100644 (file)
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -1,4 +1,4 @@
-;;; battery.el --- display battery status information
+;;; 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.