aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-01-09 17:49:08 +0800
committerChong Yidong2012-01-09 17:49:08 +0800
commited516deec46c8e45356c066b79c3f77ca8cdb4d0 (patch)
tree1c9509e3418e52bad1352c60f8116ef4b84a61da /src
parent1ba94341834d2846ca3bde3e5c1154fb365b7360 (diff)
downloademacs-ed516deec46c8e45356c066b79c3f77ca8cdb4d0.tar.gz
emacs-ed516deec46c8e45356c066b79c3f77ca8cdb4d0.zip
Fix uninitialized variable in note_mouse_highlight (backport from trunk).
* xdisp.c (note_mouse_highlight): Initialize `area'. (Bug#9947)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/xdisp.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7cfb3aa61e1..46d1b292425 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -9,9 +9,9 @@
9 9
102012-01-09 Eli Zaretskii <eliz@gnu.org> 102012-01-09 Eli Zaretskii <eliz@gnu.org>
11 11
12 * xdisp.c (note_mouse_highlight): Initialize `part', to avoid a 12 * xdisp.c (note_mouse_highlight): Initialize `area'. (Bug#9947)
13 possible random value that matches one of those tested as 13 Initialize `part', to avoid a possible random value that matches
14 condition to clear the mouse face. 14 one of those tested as condition to clear the mouse face.
15 15
162012-01-09 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 162012-01-09 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
17 17
diff --git a/src/xdisp.c b/src/xdisp.c
index ca61947be8b..1980ac69c46 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -23580,7 +23580,7 @@ note_mouse_highlight (f, x, y)
23580 && XFASTINT (w->last_modified) == BUF_MODIFF (b) 23580 && XFASTINT (w->last_modified) == BUF_MODIFF (b)
23581 && XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b)) 23581 && XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b))
23582 { 23582 {
23583 int hpos, vpos, pos, i, dx, dy, area; 23583 int hpos, vpos, pos, i, dx, dy, area = LAST_AREA;
23584 struct glyph *glyph; 23584 struct glyph *glyph;
23585 Lisp_Object object; 23585 Lisp_Object object;
23586 Lisp_Object mouse_face = Qnil, overlay = Qnil, position; 23586 Lisp_Object mouse_face = Qnil, overlay = Qnil, position;