# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1137844153 0
# Node ID 9670873b887a62f43ad74cbde568ad2f14d8d0d7
# Parent  8db317ab20fc292d0d3804d8cc42841cbba71aa7
*** empty log message ***

diff -r 8db317ab20fc -r 9670873b887a lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jan 21 11:48:25 2006 +0000
+++ b/lisp/ChangeLog	Sat Jan 21 11:49:13 2006 +0000
@@ -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 -r 8db317ab20fc -r 9670873b887a man/ChangeLog
--- a/man/ChangeLog	Sat Jan 21 11:48:25 2006 +0000
+++ b/man/ChangeLog	Sat Jan 21 11:49:13 2006 +0000
@@ -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.