*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 54af57feb0fbd6285edb6f6e8ea261a3487de7f1..981bbbf299351d2785510dafccc35bb58d4380bf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-21  Marien Zwart  <marienz@gentoo.org>  (tiny change)
+
+       * progmodes/python.el (python-mode) <eldoc-mode-hook>: Pass nil as
+       the first arg to run-python.
+
 2006-01-21  Eli Zaretskii  <eliz@gnu.org>
 
        * startup.el (command-line-1): Handle --no-desktop if desktop.el

diff --git a/man/ChangeLog b/man/ChangeLog
index 8dcbfcb1ae4919bb92e85d236596bc5904431caa..68f55e3c24211fb8630a55d93cb606a413f6f3fc 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-15  Sven Joachim  <svenjoac@gmx.de>  (tiny change)
+
+       * files.texi (File Aliases): Don't claim that usually separate
+       buffers are created for two file names that name the same data.
+       Mention additional situations where different names mean the same
+       file on disk.
+
 2006-01-19  Richard M. Stallman  <rms@gnu.org>
 
        * killing.texi (Deletion): Upcase @key argument.