# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1176864224 0
# Node ID bdefea1a6a49fa2f0570cff58d875fc593e73fd0
# Parent  293993a9e1e7729fbeb29f16c63db5914e778b82
*** empty log message ***

diff -r 293993a9e1e7 -r bdefea1a6a49 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Apr 18 02:32:04 2007 +0000
+++ b/lisp/ChangeLog	Wed Apr 18 02:43:44 2007 +0000
@@ -1,3 +1,8 @@
+2007-04-18  Levin Du  <zslevin@gmail.com>  (tiny change)
+
+	* calendar/parse-time.el (parse-time-string-chars): Check if CHAR
+	is less than the length of parse-time-syntax.
+
 2007-04-17  David Kastrup  <dak@gnu.org>
 
 	* replace.el (query-replace-regexp-eval): Deprecate.
@@ -730,6 +735,13 @@
 	(number-of-diary-entries): Change :set to use diary-set-maybe-redraw.
 	(diary-list-entries): Always run diary-mode.
 
+2007-03-20  Kenichi Handa  <handa@m17n.org>
+
+	* international/quail.el (quail-setup-completion-buf): Make the
+	completion buffer read-only.
+	(quail-completion): Adjusted for the above change.  Leave the
+	modified flag nil.
+
 2007-03-20  David Kastrup  <dak@gnu.org>
 
 	* files.el (magic-mode-alist): Require literal "%!PS" string for
@@ -793,6 +805,7 @@
 	* isearchb.el (isearchb-follow-char):
 	* subr.el (def-edebug-spec): Fix typo in docstring.
 
+>>>>>>> 1.10924
 2007-03-19  Richard Stallman  <rms@gnu.org>
 
 	* files.el (default-directory): Mark safe.