*** empty log message ***

diff --git a/etc/TODO b/etc/TODO
index 34dec4f1de2cfff5efc693bd59d6e39387bff39e..2f7951e2b4cfb42327390b6d0a345039f262d323 100644 (file)
--- 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 cf9ecfee24f1d0012092c61c2b0a7adff3b3713f..4d0af22c06d202a457ee490a273f8f02fd894334 100644 (file)
--- 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 e83940cecd61517e17ab0a8fb76995caa221c5fa..f11202c3064ff72b4ae831aca2e6e04bc36d24ad 100644 (file)
--- 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.