2 files changed, 16 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5783263a9ec..0973abca3b5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2001-03-06  Gerd Moellmann  <gerd@gnu.org>
 
+        * bookmark.el (bookmark-get-bookmark): Use assoc-ignore-case if
+        bookmark-completion-ignore-case it t.
+
         * term/x-win.el (x-handle-xrm-switch): Accept more than one -xrm
         switch, like xterm, and concat resource strings, with a newline
         between them.
diff --git a/src/ChangeLog b/src/ChangeLog
index 9c468c35107..f09e4eb0ea7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,18 @@
 2001-03-06  Gerd Moellmann  <gerd@gnu.org>
 
+        * xterm.c (note_mouse_highlight): Call mouse_face_overlay_overlaps
+        to detect a case where we have to highlight a different region
+        despite not having left the currently highlighted region.
+        Set mouse_face_overlay in the x_display_info.
+        (x_term_init): Initialze the x_display_info's mouse_face_overlay.
+
+        * xterm.h (struct x_display_info): Add mouse_face_overlay.
+
+        * buffer.c (mouse_face_overlay_overlaps): New function.
+
+        * lisp.h (mouse_face_overlay_overlaps): Add prototype.
+        (Qmouse_face): Declare extern.
+
         * xdisp.c (redisplay_internal): Set windows_or_buffers_changed
         if face_change_count is non-zero.