aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-11-04 00:11:40 +0200
committerEli Zaretskii2011-11-04 00:11:40 +0200
commit4e2fb5c7623c197c464f348881ac89724191cbd4 (patch)
treef24f9ee9819993129031d27a6dc54eb57f97078c /src
parent2a58bbc1830abaf7b51cb9d94df884dc92071ddf (diff)
downloademacs-4e2fb5c7623c197c464f348881ac89724191cbd4.tar.gz
emacs-4e2fb5c7623c197c464f348881ac89724191cbd4.zip
Fix bug #9947 with referencing uninitialized variable.
src/xdisp.c (note_mouse_highlight): Initialize `area'.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xdisp.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cc3391cfee5..f198f37d0c1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-11-03 Eli Zaretskii <eliz@gnu.org> 12011-11-03 Eli Zaretskii <eliz@gnu.org>
2 2
3 * xdisp.c (note_mouse_highlight): Initialize `area'. (Bug#9947)
4
3 * w32fns.c (unwind_create_frame): If needed, free the glyph 5 * w32fns.c (unwind_create_frame): If needed, free the glyph
4 matrices of the partially constructed frame. (Bug#9943) 6 matrices of the partially constructed frame. (Bug#9943)
5 * xfns.c (unwind_create_frame): Likewise. 7 * xfns.c (unwind_create_frame): Likewise.
diff --git a/src/xdisp.c b/src/xdisp.c
index 97687f8975b..257e4ad4280 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26892,7 +26892,7 @@ note_mouse_highlight (struct frame *f, int x, int y)
26892 && XFASTINT (w->last_modified) == BUF_MODIFF (b) 26892 && XFASTINT (w->last_modified) == BUF_MODIFF (b)
26893 && XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b)) 26893 && XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b))
26894 { 26894 {
26895 int hpos, vpos, dx, dy, area; 26895 int hpos, vpos, dx, dy, area = LAST_AREA;
26896 EMACS_INT pos; 26896 EMACS_INT pos;
26897 struct glyph *glyph; 26897 struct glyph *glyph;
26898 Lisp_Object object; 26898 Lisp_Object object;