From: Kim F. Storm <storm@cua.dk>
Date: Mon, 22 Jan 2007 22:37:15 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.93~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=67155dc3f4e665d14fd0b567a805b1ca8eb3eb2c;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c93fd214d02..f68fda2acf1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-22  Kim F. Storm  <storm@cua.dk>
+
+	* ido.el (ido-active): Add xemacs test from ido-minibuffer-setup.
+	(ido-initiate-auto-merge, ido-exhibit, ido-minibuffer-setup)
+	(ido-tidy): Use ido-active.
+
 2007-01-22  Chris Moore  <christopher.ian.moore@gmail.com>  (tiny change)
 
 	* hexl.el (hexl-mode-exit): Add missing quote.