From: Kenichi Handa <handa@m17n.org>
Date: Thu, 21 Sep 2006 01:23:31 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~419
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=01e0132dbb8cb49c3d9077076c269985616130de;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce4b4a3c584..67dffed400e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,14 @@
 	* emacs-lisp/cl.el (pushnew): Rework 2006-09-10 change.  Use memql
 	instead of add-to-list in the simple case.
 
+2006-09-20  Kenichi Handa  <handa@m17n.org>
+
+	* isearch.el (isearch-process-search-char): Cancel the previous
+	change.
+	(isearch-search-string): New function.
+	(isearch-search): Use isearch-search-string.
+	(isearch-lazy-highlight-search): Likewise.
+
 2006-09-20  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
 	* delim-col.el : Fix X-URL comment.
@@ -43,6 +51,7 @@
 	* menu-bar.el (clipboard-yank): Bomb out in interactive use if
 	buffer is read-only.
 
+>>>>>>> 1.10102
 2006-09-18  Ken Manheimer  <ken.manheimer@gmail.com>
 
 	* allout.el (allout-unprotected): Let inhibit-read-only only when