*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4ae154ff8fefd9e3d504c2cbcd6a0c788f1f58a..9971b7d0d2b0819041781bccafb6a549aad80a7c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-29  Gerd Moellmann  <gerd@gnu.org>
 
+       * dabbrev.el (dabbrev-expand): Don't display messages in the
+       echo area if the minibuffer window is active.
+
        * jit-lock.el (jit-lock-mode): Add after change function to
        local hook.
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 27215026414a9f227b3e61a1ebf3d36bb85c960a..6b5e24989a3495831f4cd99056d87460c5d8196a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-29  Gerd Moellmann  <gerd@gnu.org>
 
+       * syntax.c (find_defun_start): Move test for
+       open_paren_in_column_0_is_defun_start outside of the loop.
+
        * xdisp.c (redisplay_window): Really switch buffers when
        displaying mode lines, and temporarily set selected_frame to the
        frame of the window that's redisplayed.