diff options
| author | Kim F. Storm | 2002-10-26 23:53:07 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2002-10-26 23:53:07 +0000 |
| commit | 1b7334a40e1177daaf43056f6b524efdfc1ccafd (patch) | |
| tree | 7de3b5b99e07e8be736f683e68412ec7b109ea5e /src | |
| parent | ee7ddec4ecf60b54558229a01c92339321d1f476 (diff) | |
| download | emacs-1b7334a40e1177daaf43056f6b524efdfc1ccafd.tar.gz emacs-1b7334a40e1177daaf43056f6b524efdfc1ccafd.zip | |
(note_mouse_highlight): Don't use mouse-face if hidden.
Diffstat (limited to 'src')
| -rw-r--r-- | src/macterm.c | 9 | ||||
| -rw-r--r-- | src/w32term.c | 9 | ||||
| -rw-r--r-- | src/xterm.c | 9 |
3 files changed, 18 insertions, 9 deletions
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) | |||
| 7330 | 7330 | ||
| 7331 | dpyinfo->mouse_face_face_id | 7331 | dpyinfo->mouse_face_face_id |
| 7332 | = face_at_buffer_position (w, pos, 0, 0, | 7332 | = face_at_buffer_position (w, pos, 0, 0, |
| 7333 | &ignore, pos + 1, 1); | 7333 | &ignore, pos + 1, |
| 7334 | !dpyinfo->mouse_face_hidden); | ||
| 7334 | 7335 | ||
| 7335 | /* Display it as active. */ | 7336 | /* Display it as active. */ |
| 7336 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); | 7337 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); |
| @@ -7372,7 +7373,8 @@ note_mouse_highlight (f, x, y) | |||
| 7372 | if (BUFFERP (object)) | 7373 | if (BUFFERP (object)) |
| 7373 | dpyinfo->mouse_face_face_id | 7374 | dpyinfo->mouse_face_face_id |
| 7374 | = face_at_buffer_position (w, pos, 0, 0, | 7375 | = face_at_buffer_position (w, pos, 0, 0, |
| 7375 | &ignore, pos + 1, 1); | 7376 | &ignore, pos + 1, |
| 7377 | !dpyinfo->mouse_face_hidden); | ||
| 7376 | 7378 | ||
| 7377 | /* Display it as active. */ | 7379 | /* Display it as active. */ |
| 7378 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); | 7380 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); |
| @@ -7451,7 +7453,8 @@ note_mouse_highlight (f, x, y) | |||
| 7451 | dpyinfo->mouse_face_window = window; | 7453 | dpyinfo->mouse_face_window = window; |
| 7452 | dpyinfo->mouse_face_face_id | 7454 | dpyinfo->mouse_face_face_id |
| 7453 | = face_at_buffer_position (w, pos, 0, 0, | 7455 | = face_at_buffer_position (w, pos, 0, 0, |
| 7454 | &ignore, pos + 1, 1); | 7456 | &ignore, pos + 1, |
| 7457 | !dpyinfo->mouse_face_hidden); | ||
| 7455 | 7458 | ||
| 7456 | /* Display it as active. */ | 7459 | /* Display it as active. */ |
| 7457 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); | 7460 | 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) | |||
| 6816 | 6816 | ||
| 6817 | dpyinfo->mouse_face_face_id | 6817 | dpyinfo->mouse_face_face_id |
| 6818 | = face_at_buffer_position (w, pos, 0, 0, | 6818 | = face_at_buffer_position (w, pos, 0, 0, |
| 6819 | &ignore, pos + 1, 1); | 6819 | &ignore, pos + 1, |
| 6820 | !dpyinfo->mouse_face_hidden); | ||
| 6820 | 6821 | ||
| 6821 | /* Display it as active. */ | 6822 | /* Display it as active. */ |
| 6822 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); | 6823 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); |
| @@ -6858,7 +6859,8 @@ note_mouse_highlight (f, x, y) | |||
| 6858 | if (BUFFERP (object)) | 6859 | if (BUFFERP (object)) |
| 6859 | dpyinfo->mouse_face_face_id | 6860 | dpyinfo->mouse_face_face_id |
| 6860 | = face_at_buffer_position (w, pos, 0, 0, | 6861 | = face_at_buffer_position (w, pos, 0, 0, |
| 6861 | &ignore, pos + 1, 1); | 6862 | &ignore, pos + 1, |
| 6863 | !dpyinfo->mouse_face_hidden); | ||
| 6862 | 6864 | ||
| 6863 | /* Display it as active. */ | 6865 | /* Display it as active. */ |
| 6864 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); | 6866 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); |
| @@ -6937,7 +6939,8 @@ note_mouse_highlight (f, x, y) | |||
| 6937 | dpyinfo->mouse_face_window = window; | 6939 | dpyinfo->mouse_face_window = window; |
| 6938 | dpyinfo->mouse_face_face_id | 6940 | dpyinfo->mouse_face_face_id |
| 6939 | = face_at_buffer_position (w, pos, 0, 0, | 6941 | = face_at_buffer_position (w, pos, 0, 0, |
| 6940 | &ignore, pos + 1, 1); | 6942 | &ignore, pos + 1, |
| 6943 | !dpyinfo->mouse_face_hidden); | ||
| 6941 | 6944 | ||
| 6942 | /* Display it as active. */ | 6945 | /* Display it as active. */ |
| 6943 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); | 6946 | 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) | |||
| 7257 | dpyinfo->mouse_face_window = window; | 7257 | dpyinfo->mouse_face_window = window; |
| 7258 | dpyinfo->mouse_face_face_id | 7258 | dpyinfo->mouse_face_face_id |
| 7259 | = face_at_buffer_position (w, pos, 0, 0, | 7259 | = face_at_buffer_position (w, pos, 0, 0, |
| 7260 | &ignore, pos + 1, 1); | 7260 | &ignore, pos + 1, |
| 7261 | !dpyinfo->mouse_face_hidden); | ||
| 7261 | 7262 | ||
| 7262 | /* Display it as active. */ | 7263 | /* Display it as active. */ |
| 7263 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); | 7264 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); |
| @@ -7299,7 +7300,8 @@ note_mouse_highlight (f, x, y) | |||
| 7299 | if (BUFFERP (object)) | 7300 | if (BUFFERP (object)) |
| 7300 | dpyinfo->mouse_face_face_id | 7301 | dpyinfo->mouse_face_face_id |
| 7301 | = face_at_buffer_position (w, pos, 0, 0, | 7302 | = face_at_buffer_position (w, pos, 0, 0, |
| 7302 | &ignore, pos + 1, 1); | 7303 | &ignore, pos + 1, |
| 7304 | !dpyinfo->mouse_face_hidden); | ||
| 7303 | 7305 | ||
| 7304 | /* Display it as active. */ | 7306 | /* Display it as active. */ |
| 7305 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); | 7307 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); |
| @@ -7378,7 +7380,8 @@ note_mouse_highlight (f, x, y) | |||
| 7378 | dpyinfo->mouse_face_window = window; | 7380 | dpyinfo->mouse_face_window = window; |
| 7379 | dpyinfo->mouse_face_face_id | 7381 | dpyinfo->mouse_face_face_id |
| 7380 | = face_at_buffer_position (w, pos, 0, 0, | 7382 | = face_at_buffer_position (w, pos, 0, 0, |
| 7381 | &ignore, pos + 1, 1); | 7383 | &ignore, pos + 1, |
| 7384 | !dpyinfo->mouse_face_hidden); | ||
| 7382 | 7385 | ||
| 7383 | /* Display it as active. */ | 7386 | /* Display it as active. */ |
| 7384 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); | 7387 | show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); |