(note_mouse_highlight): Don't use mouse-face if hidden.

1b7334a4 · Kim F. Storm · ee7ddec4 · 1b7334a4 · 1b7334a4 · 1b7334a4
Commit 1b7334a4 authored Oct 26, 2002 by Kim F. Storm
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 9 deletions

src/macterm.c src/macterm.c +6 -3

src/w32term.c src/w32term.c +6 -3

src/xterm.c src/xterm.c +6 -3

No files found.
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -7330,7 +7330,8 @@ note_mouse_highlight (f, x, y)

 	      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 @@ note_mouse_highlight (f, x, y)
 	      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 @@ note_mouse_highlight (f, x, y)
 		  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);

--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6816,7 +6816,8 @@ note_mouse_highlight (f, x, y)

 	      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 @@ note_mouse_highlight (f, x, y)
 	      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 @@ note_mouse_highlight (f, x, y)
 		  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);

--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7257,7 +7257,8 @@ note_mouse_highlight (f, x, y)
 	      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 @@ note_mouse_highlight (f, x, y)
 	      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 @@ note_mouse_highlight (f, x, y)
 		  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);