*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce4b4a3c58424d0f0bc236e4fb27698398ae7345..67dffed400e957a0adf5dd7f5870bbef65f6eb9c 100644 (file)
--- 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