From 942d56b8a1fad54cc809d20870983ffaff2e2f16 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 21 Jan 2006 11:49:13 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 5 +++++
 man/ChangeLog  | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 54af57feb0f..981bbbf2993 100644
--- 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 8dcbfcb1ae4..68f55e3c242 100644
--- 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.
-- 
2.11.4.GIT