# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1035676387 0
# Node ID 77df00035231e125e25f598890373f1e7eb76e37
# Parent  d9e24006f623d0a1fc751c721011dd2a51bb3d04
(note_mouse_highlight): Don't use mouse-face if hidden.

diff -r d9e24006f623 -r 77df00035231 src/macterm.c
--- a/src/macterm.c	Sat Oct 26 23:52:10 2002 +0000
+++ b/src/macterm.c	Sat Oct 26 23:53:07 2002 +0000
@@ -7330,7 +7330,8 @@
 
 	      dpyinfo->mouse_face_face_id
 		= face_at_buffer_position (w, pos, 0, 0,
-					   &ignore, pos + 1, 1);
+					   &ignore, pos + 1,
+					   !dpyinfo->mouse_face_hidden);
 
 	      /* Display it as active.  */
 	      show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
@@ -7372,7 +7373,8 @@
 	      if (BUFFERP (object))
 		dpyinfo->mouse_face_face_id
 		  = face_at_buffer_position (w, pos, 0, 0,
-					     &ignore, pos + 1, 1);
+					     &ignore, pos + 1,
+					     !dpyinfo->mouse_face_hidden);
 
 	      /* Display it as active.  */
 	      show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
@@ -7451,7 +7453,8 @@
 		  dpyinfo->mouse_face_window = window;
 		  dpyinfo->mouse_face_face_id
 		    = face_at_buffer_position (w, pos, 0, 0,
-					       &ignore, pos + 1, 1);
+					       &ignore, pos + 1,
+					       !dpyinfo->mouse_face_hidden);
 
 		  /* Display it as active.  */
 		  show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
diff -r d9e24006f623 -r 77df00035231 src/w32term.c
--- a/src/w32term.c	Sat Oct 26 23:52:10 2002 +0000
+++ b/src/w32term.c	Sat Oct 26 23:53:07 2002 +0000
@@ -6816,7 +6816,8 @@
 
 	      dpyinfo->mouse_face_face_id
 		= face_at_buffer_position (w, pos, 0, 0,
-					   &ignore, pos + 1, 1);
+					   &ignore, pos + 1,
+					   !dpyinfo->mouse_face_hidden);
 
 	      /* Display it as active.  */
 	      show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
@@ -6858,7 +6859,8 @@
 	      if (BUFFERP (object))
 		dpyinfo->mouse_face_face_id
 		  = face_at_buffer_position (w, pos, 0, 0,
-					     &ignore, pos + 1, 1);
+					     &ignore, pos + 1,
+					     !dpyinfo->mouse_face_hidden);
 
 	      /* Display it as active.  */
 	      show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
@@ -6937,7 +6939,8 @@
 		  dpyinfo->mouse_face_window = window;
 		  dpyinfo->mouse_face_face_id
 		    = face_at_buffer_position (w, pos, 0, 0,
-					       &ignore, pos + 1, 1);
+					       &ignore, pos + 1,
+					       !dpyinfo->mouse_face_hidden);
 
 		  /* Display it as active.  */
 		  show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
diff -r d9e24006f623 -r 77df00035231 src/xterm.c
--- a/src/xterm.c	Sat Oct 26 23:52:10 2002 +0000
+++ b/src/xterm.c	Sat Oct 26 23:53:07 2002 +0000
@@ -7257,7 +7257,8 @@
 	      dpyinfo->mouse_face_window = window;
 	      dpyinfo->mouse_face_face_id
 		= face_at_buffer_position (w, pos, 0, 0,
-					   &ignore, pos + 1, 1);
+					   &ignore, pos + 1,
+					   !dpyinfo->mouse_face_hidden);
 
 	      /* Display it as active.  */
 	      show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
@@ -7299,7 +7300,8 @@
 	      if (BUFFERP (object))
 		dpyinfo->mouse_face_face_id
 		  = face_at_buffer_position (w, pos, 0, 0,
-					     &ignore, pos + 1, 1);
+					     &ignore, pos + 1,
+					     !dpyinfo->mouse_face_hidden);
 
 	      /* Display it as active.  */
 	      show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);
@@ -7378,7 +7380,8 @@
 		  dpyinfo->mouse_face_window = window;
 		  dpyinfo->mouse_face_face_id
 		    = face_at_buffer_position (w, pos, 0, 0,
-					       &ignore, pos + 1, 1);
+					       &ignore, pos + 1,
+					       !dpyinfo->mouse_face_hidden);
 
 		  /* Display it as active.  */
 		  show_mouse_face (dpyinfo, DRAW_MOUSE_FACE);