diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-01-09 17:35:21 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-01-09 17:35:21 +0800 |
| commit | d12815f82606816370e32309deefa8081de64d51 (patch) | |
| tree | 39d6be5b59fea2b6558e6b077a8e52d4d61e90eb | |
| parent | 0c5b9eef72cbb54964d34c28ddffd17a0646bc87 (diff) | |
| download | emacs-d12815f82606816370e32309deefa8081de64d51.tar.gz | |
Fix use of uninitialized var (backport from trunk).
* xdisp.c (note_mouse_highlight): Fix use of uninitialized var.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c819bb08369..fcaff20727d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-01-09 Chong Yidong <cyd@gnu.org> + + * xdisp.c (note_mouse_highlight): Fix use of uninitialized var. + 2012-01-09 Eli Zaretskii <eliz@gnu.org> * xdisp.c (note_mouse_highlight): Initialize `part', to avoid a diff --git a/src/xdisp.c b/src/xdisp.c index 8e5cf3d8f3e..ed0cff5ce82 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -23518,11 +23518,14 @@ note_mouse_highlight (f, x, y) /* Which window is that in? */ window = window_from_coordinates (f, x, y, &part, 0, 0, 1); - /* If we were displaying active text in another window, clear that. - Also clear if we move out of text area in same window. */ - if (! EQ (window, dpyinfo->mouse_face_window) - || (part != ON_TEXT && part != ON_MODE_LINE && part != ON_HEADER_LINE - && !NILP (dpyinfo->mouse_face_window))) + /* 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 (dpyinfo); /* Not on a window -> return. */ |