From: Kim F. Storm <storm@cua.dk>
Date: Sat, 26 Oct 2002 23:53:07 +0000 (+0000)
Subject: (note_mouse_highlight): Don't use mouse-face if hidden.
X-Git-Tag: ttn-vms-21-2-B4~12703
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1b7334a40e1177daaf43056f6b524efdfc1ccafd;p=emacs.git

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

diff --git a/src/macterm.c b/src/macterm.c
index 5da54e2c73f..2646b28618d 100644
--- 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);
diff --git a/src/w32term.c b/src/w32term.c
index f8d4e2e664e..55ce9d62391 100644
--- 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);
diff --git a/src/xterm.c b/src/xterm.c
index 7d0b6728f06..31b4938bc59 100644
--- 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);