From fb5cba5bb73631e54796c5964d6aa81b15a7f1c7 Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@users.sourceforge.net>
Date: Thu, 13 Nov 2003 15:10:21 +0000
Subject: merge back changes from 4.1 (17567, 17569)

---
 ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 9e80671ea..0cf1bb3ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -692,6 +692,15 @@
 	* 17571: Src/Modules/terminfo.c: backport of terminfo segfault
         fix from 4.1.
 
+2002-08-20  Sven Wischnowsky  <wischnow@zsh.org>
+
+	* 17569: Src/Zle/zle_tricky.c: fix typo in comment
+
+	* 17567: Src/Zle/zle_main.c, Src/Zle/zle_thingy.c,
+	Src/Zle/zle_tricky.c: fix default completion module loading,
+	use compctl if it hasn't been loaded already and no completion
+	widgets have been defined
+
 2002-08-19  Oliver Kiddle  <opk@zsh.org>
 
 	* unposted: Completion/X/Command/_nedit, Completion/Unix/Command/_mail,
-- 
cgit 1.4.1