*** empty log message ***

2 files changed, 6 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4ae154ff8f..9971b7d0d2b 100644
--- 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 27215026414..6b5e24989a3 100644
--- 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.