diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2001-05-14 14:56:23 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2001-05-14 14:56:23 +0000 |
| commit | 58e5af83c94b24a9c5cc37bcc1338300d25869fc (patch) | |
| tree | 31a506e86cf70643d6d311078fc72f818c986061 | |
| parent | 3cf80731c1ef01dca1e0877436eb38b37b50cd09 (diff) | |
| download | emacs-58e5af83c94b24a9c5cc37bcc1338300d25869fc.tar.gz emacs-58e5af83c94b24a9c5cc37bcc1338300d25869fc.tar.bz2 emacs-58e5af83c94b24a9c5cc37bcc1338300d25869fc.zip | |
(note_mouse_highlight): Avoid changing the mouse
pointer shape when show_mouse_face has already done it.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xterm.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 280b828f738..9cd3520dcb6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -8,7 +8,10 @@ 2001-05-14 Gerd Moellmann <gerd@gnu.org> - * xterm.c (x_draw_glyphs): Fix compuation of rightmost x for + * xterm.c (note_mouse_highlight): Avoid changing the mouse + pointer shape when show_mouse_face has already done it. + + * xterm.c (x_draw_glyphs): Fix computation of rightmost x for full-width rows. * xfaces.c (split_font_name): Make sure to leave the loop diff --git a/src/xterm.c b/src/xterm.c index 056514d7096..3dfe0fac2aa 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -6997,6 +6997,7 @@ note_mouse_highlight (f, x, y) /* Display it as active. */ show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); + cursor = None; } /* Handle the text property case. */ else if (!NILP (mouse_face) && BUFFERP (object)) @@ -7038,6 +7039,7 @@ note_mouse_highlight (f, x, y) /* Display it as active. */ show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); + cursor = None; } else if (!NILP (mouse_face) && STRINGP (object)) { @@ -7069,6 +7071,7 @@ note_mouse_highlight (f, x, y) = face_at_string_position (w, object, pos, 0, 0, 0, &ignore, glyph->face_id, 1); show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); + cursor = None; } } |