From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 11 Mar 2006 15:25:13 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~3686
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5a893bff84978977970c442f868d16fa06bf53a2;p=emacs.git

*** empty log message ***
---

diff --git a/etc/TODO b/etc/TODO
index 34dec4f1de2..2f7951e2b4c 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -60,6 +60,10 @@ to the FSF.
 
 ** M-! M-n should fetch the buffer-file-name as the default.
 
+** Redesign the load-history data structure so it can cope better
+  with evaluating definitions of the same function from different files,
+  recording which file the latest definition came from.
+  
 * Important features:
 
 ** Provide user-friendly ways to list all available font families,
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf9ecfee24f..4d0af22c06d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2006-03-11  Richard Stallman  <rms@gnu.org>
+
+	* mail/rmail.el (rmail-ignored-headers): Discard DomainKey-Signature.
+
+	* eshell/eshell.el (eshell-prefer-to-shell): Variable deleted;
+	the way it is implemented is too unclean.
+
+	* simple.el (kill-region, yank): Doc fix.
+
+	* battery.el (battery-echo-area-format): Doc fix.
+	(battery-mode-line-format): Likewise.
+	(battery-linux-proc-apm, battery-linux-proc-acpi): Likewise.
+	(battery-linux-proc-acpi): Ignore batteries that say "charged".
+
 2006-03-11  Kurt Hornik  <Kurt.Hornik@wu-wien.ac.at>
 
 	* progmodes/octave-mod.el (octave-indent-for-comment): Behave
diff --git a/src/ChangeLog b/src/ChangeLog
index e83940cecd6..f11202c3064 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2006-03-11  Richard Stallman  <rms@gnu.org>
 
+	* keymap.c (describe_map): Shorten string to indicate shadowed binding.
+
 	* vm-limit.c (get_lim_data, lim_data, data_space_start):
 	Moved from mem-limits.h.
 	(enum warnlevel): New data type.