2 files changed, 12 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index b534cbff324..879938761ab 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2472,7 +2472,7 @@ file, you can put a `coding:' tags to override it.)
 ** The new function `merge-coding-systems' fills in unspecified aspects
 of one coding system from another coding system.
 
----
++++
 ** The variable `safe-local-eval-forms' specifies a list of forms that
 are ok to evaluate when they appear in an `eval' local variables
 specification.  Normally Emacs asks for confirmation before evaluating
diff --git a/src/ChangeLog b/src/ChangeLog
index 017c214739e..7ece76feadc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,16 @@
 2004-04-06  Kim F. Storm  <storm@cua.dk>
 
+        * msdos.c (clear_mouse_face): Only clear mouse highlight if not hidden.
+        (dos_rawgetc): Set mouse_face_hidden after clearing highlight.
+
+        * w32term.c (w32_read_socket): Set mouse_face_hidden after
+        clearing highlight.
+
+        * xdisp.c (clear_mouse_face): Only clear mouse highlight if not hidden.
+
+        * xterm.c (handle_one_xevent): Set mouse_face_hidden after
+        clearing highlight.
+
         * indent.c (vmotion): Do not reserve one column for continuation
         marks on window frames.