* src/xdisp.c (note_mode_line_or_margin_highlight): Initialize

Cursor to No_Cursor for HAVE_WINDOW_SYSTEM also.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9f6a54027a68db190556c9177f87d3cdf5070a38..92675fce0cfc55dbd9ea1226ffa36629c238f9a0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-07  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * xdisp.c (note_mode_line_or_margin_highlight): Initialize
+       Cursor to No_Cursor for HAVE_WINDOW_SYSTEM also.
+
 2010-11-06  Eli Zaretskii  <eliz@gnu.org>
 
        * xfns.c (Fx_show_tip): If any of the tool-tip text lines is R2L,

diff --git a/src/xdisp.c b/src/xdisp.c
index b3da465421355d40caf951e28dfc68d4f9d2f85d..928a37a2b5092bb23e9c10c8e4429071df739926 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -25071,10 +25071,8 @@ note_mode_line_or_margin_highlight (Lisp_Object window, int x, int y,
   Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
 #ifdef HAVE_WINDOW_SYSTEM
   Display_Info *dpyinfo;
-  Cursor cursor;
-#else
-  Cursor cursor = No_Cursor;
 #endif
+  Cursor cursor = No_Cursor;
   Lisp_Object pointer = Qnil;
   int dx, dy, width, height;
   EMACS_INT charpos;