summaryrefslogtreecommitdiff
path: root/src/msdos.c
diff options
context:
space:
mode:
authorKaroly Lorentey <lorentey@elte.hu>2004-04-08 12:29:09 +0000
committerKaroly Lorentey <lorentey@elte.hu>2004-04-08 12:29:09 +0000
commitfbada922e4bc08f6a1dc228062f3f97213d9980f (patch)
tree4206c226846f15c969363b88a572dc914526c170 /src/msdos.c
parent1ba538094c4cd3da172d91878fa76d96c6b1cbd2 (diff)
parent8a7757f6f5793563a4337a3f761c8cc73974e27d (diff)
downloademacs-fbada922e4bc08f6a1dc228062f3f97213d9980f.tar.gz
emacs-fbada922e4bc08f6a1dc228062f3f97213d9980f.tar.bz2
emacs-fbada922e4bc08f6a1dc228062f3f97213d9980f.zip
Merged in changes from CVS HEAD
Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-181 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-182 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-183 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-184 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-185 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-186 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-187 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-188 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-189 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-190 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-191 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-192 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-132
Diffstat (limited to 'src/msdos.c')
-rw-r--r--src/msdos.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/msdos.c b/src/msdos.c
index e73f284fa4d..39d28564890 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1329,7 +1329,7 @@ show_mouse_face (struct display_info *dpyinfo, int hl)
static void
clear_mouse_face (struct display_info *dpyinfo)
{
- if (! NILP (dpyinfo->mouse_face_window))
+ if (!dpyinfo->mouse_face_hidden && ! NILP (dpyinfo->mouse_face_window))
show_mouse_face (dpyinfo, 0);
dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1;
@@ -3131,7 +3131,7 @@ dos_rawgetc ()
union REGS regs;
struct display_info *dpyinfo = FRAME_X_DISPLAY_INFO (SELECTED_FRAME());
EVENT_INIT (event);
-
+
#ifndef HAVE_X_WINDOWS
/* Maybe put the cursor where it should be. */
IT_cmgoto (SELECTED_FRAME());
@@ -3342,8 +3342,8 @@ dos_rawgetc ()
if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
{
- dpyinfo->mouse_face_hidden = 1;
clear_mouse_face (dpyinfo);
+ dpyinfo->mouse_face_hidden = 1;
}
if (code >= 0x100)