No revisions to pull. Conflicting tags: mh-e-doc-8.3 mh-e-8.3 ------------------------------------------------------------ revno: 106233 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2011-10-29 12:02:39 +0200 message: Revert last commit. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-29 09:36:42 +0000 +++ src/ChangeLog 2011-10-29 10:02:39 +0000 @@ -1,8 +1,3 @@ -2011-10-29 Eli Zaretskii - - * xdisp.c (note_mouse_highlight): Don't clear mouse highlight if - hlinfo->mouse_face_window is nil. (Bug#9902) - 2011-10-29 Andreas Schwab * minibuf.c (read_minibuf_noninteractive): Allow reading empty === modified file 'src/xdisp.c' --- src/xdisp.c 2011-10-29 09:36:42 +0000 +++ src/xdisp.c 2011-10-29 10:02:39 +0000 @@ -26835,14 +26835,14 @@ /* Which window is that in? */ window = window_from_coordinates (f, x, y, &part, 1); - if (!NILP (hlinfo->mouse_face_window) - /* If displaying active text in another window, clear that. */ - && (!EQ (window, hlinfo->mouse_face_window) - /* Also clear if we move out of text area in same window. */ - || (!NILP (window) - && part != ON_TEXT - && part != ON_MODE_LINE - && part != ON_HEADER_LINE))) + /* If displaying active text in another window, clear that. */ + if (! EQ (window, hlinfo->mouse_face_window) + /* Also clear if we move out of text area in same window. */ + || (!NILP (hlinfo->mouse_face_window) + && !NILP (window) + && part != ON_TEXT + && part != ON_MODE_LINE + && part != ON_HEADER_LINE)) clear_mouse_face (hlinfo); /* Not on a window -> return. */