diff options
| author | Kim F. Storm | 2004-04-05 21:54:02 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2004-04-05 21:54:02 +0000 |
| commit | fbb6cd8c99cad5ce1cc20641d808c3889daf777b (patch) | |
| tree | cf14a41ba441bf265638e116ea4377d4fbfe1772 /src | |
| parent | 614963bafcd2330ba902754429360d39443bb9bc (diff) | |
| download | emacs-fbb6cd8c99cad5ce1cc20641d808c3889daf777b.tar.gz emacs-fbb6cd8c99cad5ce1cc20641d808c3889daf777b.zip | |
(clear_mouse_face): Only clear mouse highlight if not hidden.
(dos_rawgetc): Set mouse_face_hidden after clearing highlight.
Diffstat (limited to 'src')
| -rw-r--r-- | src/msdos.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/msdos.c b/src/msdos.c index a2fd011e74c..c58dc6875fe 100644 --- a/src/msdos.c +++ b/src/msdos.c | |||
| @@ -1329,7 +1329,7 @@ show_mouse_face (struct display_info *dpyinfo, int hl) | |||
| 1329 | static void | 1329 | static void |
| 1330 | clear_mouse_face (struct display_info *dpyinfo) | 1330 | clear_mouse_face (struct display_info *dpyinfo) |
| 1331 | { | 1331 | { |
| 1332 | if (! NILP (dpyinfo->mouse_face_window)) | 1332 | if (!dpyinfo->mouse_face_hidden && ! NILP (dpyinfo->mouse_face_window)) |
| 1333 | show_mouse_face (dpyinfo, 0); | 1333 | show_mouse_face (dpyinfo, 0); |
| 1334 | 1334 | ||
| 1335 | dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1; | 1335 | dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1; |
| @@ -3131,7 +3131,7 @@ dos_rawgetc () | |||
| 3131 | union REGS regs; | 3131 | union REGS regs; |
| 3132 | struct display_info *dpyinfo = FRAME_X_DISPLAY_INFO (SELECTED_FRAME()); | 3132 | struct display_info *dpyinfo = FRAME_X_DISPLAY_INFO (SELECTED_FRAME()); |
| 3133 | EVENT_INIT (event); | 3133 | EVENT_INIT (event); |
| 3134 | 3134 | ||
| 3135 | #ifndef HAVE_X_WINDOWS | 3135 | #ifndef HAVE_X_WINDOWS |
| 3136 | /* Maybe put the cursor where it should be. */ | 3136 | /* Maybe put the cursor where it should be. */ |
| 3137 | IT_cmgoto (SELECTED_FRAME()); | 3137 | IT_cmgoto (SELECTED_FRAME()); |
| @@ -3342,8 +3342,8 @@ dos_rawgetc () | |||
| 3342 | 3342 | ||
| 3343 | if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)) | 3343 | if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)) |
| 3344 | { | 3344 | { |
| 3345 | dpyinfo->mouse_face_hidden = 1; | ||
| 3346 | clear_mouse_face (dpyinfo); | 3345 | clear_mouse_face (dpyinfo); |
| 3346 | dpyinfo->mouse_face_hidden = 1; | ||
| 3347 | } | 3347 | } |
| 3348 | 3348 | ||
| 3349 | if (code >= 0x100) | 3349 | if (code >= 0x100) |