From 02b1a164f96f928149477457d8adb1738cf85bf2 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 26 Nov 2005 11:20:10 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 7 ++++++-
 src/ChangeLog  | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 739a33b80a2..15467802b90 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,11 @@
+2005-11-26  Kurt Hornik  <Kurt.Hornik@wu-wien.ac.at>
+
+	* progmodes/octave-inf.el (inferior-octave-startup): Force a
+	non-empty string for secondary prompt PS2.
+
 2005-11-25  Chong Yidong  <cyd@stupidchicken.com>
 
-	* progmodes/compile.el (compilation-setup): Fix last fix.
+	* progmodes/compile.el (compilation-setup): Fix last change.
 
 2005-11-26  Nick Roberts  <nickrob@snap.net.nz>
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 2175a0dcead..5fb37a0bfad 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-26  Eli Zaretskii  <eliz@gnu.org>
+
+	* minibuf.c (syms_of_minibuf): Mention the extension of
+	`completion-auto-help's meaning by complete.el.
+
 2005-11-26  Henrik Enberg  <henrik.enberg@telia.com>
 
 	* xfaces.c (Finternal_set_lisp_face_attribute_from_resource): 
-- 
2.39.5