Mercurial > emacs
comparison src/macterm.c @ 90375:e6bf73e43cf4
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-49
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 164-184)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: man/mh-e.texi (Folders): Various edits.
- Update from erc--emacs--0
* gnus--rel--5.10 (patch 62-70)
- Merge from emacs--devo--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 28 Mar 2006 23:08:20 +0000 |
parents | e3bacb89536a bc015cae7e3e |
children | 65ca8fb66a0d |
comparison
equal
deleted
inserted
replaced
90374:cf65b3d033bb | 90375:e6bf73e43cf4 |
---|---|
10474 last_key_script = current_key_script; | 10474 last_key_script = current_key_script; |
10475 } | 10475 } |
10476 | 10476 |
10477 ObscureCursor (); | 10477 ObscureCursor (); |
10478 | 10478 |
10479 if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)) | 10479 if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight) |
10480 && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window)) | |
10480 { | 10481 { |
10481 clear_mouse_face (dpyinfo); | 10482 clear_mouse_face (dpyinfo); |
10482 dpyinfo->mouse_face_hidden = 1; | 10483 dpyinfo->mouse_face_hidden = 1; |
10483 } | 10484 } |
10484 | 10485 |