# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1158801811 0
# Node ID 582a556d515005bedf936ce94ac09922b956e0de
# Parent  e67ae9c7b3517ca93c34f014f831ae261f1035a7
*** empty log message ***

diff -r e67ae9c7b351 -r 582a556d5150 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Sep 21 00:33:59 2006 +0000
+++ b/lisp/ChangeLog	Thu Sep 21 01:23:31 2006 +0000
@@ -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