*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 654774c41be6e5f0c8e80643b7607fecd1cb5978..256470a9359e4eebcfdb28c02f4bad2e61df5c24 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2000-11-22  Miles Bader  <miles@gnu.org>
 
+       * image-file.el (insert-image-file): Don't make `read-only'
+       property rear-nonsticky.
+
        * isearch.el (isearch-original-minibuffer-message-timeout): New var.
        (isearch-mode): Set `minibuffer-message-timeout' to nil, after
        stashing away its original value.

diff --git a/src/ChangeLog b/src/ChangeLog
index cc69a3efeec6bc51ad91b51d3f7d10cdfef64492..f1da3f53227c7bddf65302a8d5d013920fe5cf6c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2000-11-22  Miles Bader  <miles@gnu.org>
 
+       * keyboard.c (Vminibuffer_message_timeout): New variable.
+       (command_loop_1): Use it to determine message timeout.
+       (syms_of_keyboard): Initialize it.
+
        * xdisp.c (syms_of_xdisp): `mode-line-inverse-video' defualts to nil.
 
 2000-11-22  Kenichi Handa  <handa@etl.go.jp>