From: Juri Linkov <juri@jurta.org>
Date: Tue, 25 Mar 2008 21:50:45 +0000 (+0000)
Subject: Add file cookie coding:iso-8859-1 for the degree sign
X-Git-Tag: emacs-pretest-23.0.90~6934
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4919479f915dd0d98878cb63d2848b12fe8da15;p=emacs.git

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 8ffa1c9d92c..780068ba898 100644
--- 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 1871a8bfb74..0fff947fc76 100644
--- 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.