# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1133004010 0
# Node ID 91ba9ac19cb1d56030bb46310e05775c84884761
# Parent  e73d5d53ea0b5c79ff026c9a045e61fae72100f4
*** empty log message ***

diff -r e73d5d53ea0b -r 91ba9ac19cb1 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Nov 26 11:19:21 2005 +0000
+++ b/lisp/ChangeLog	Sat Nov 26 11:20:10 2005 +0000
@@ -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 -r e73d5d53ea0b -r 91ba9ac19cb1 src/ChangeLog
--- a/src/ChangeLog	Sat Nov 26 11:19:21 2005 +0000
+++ b/src/ChangeLog	Sat Nov 26 11:20:10 2005 +0000
@@ -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):