Fix cursor appearance in note_mouse_highlight (Bug#16647).

* xdisp.c (note_mouse_highlight): When entering a margin area show
a non-text cursor (Bug#16647).

diff --git a/src/ChangeLog b/src/ChangeLog
index 1ef4d9fc8164382bad781bd0f18e7318e8a2b515..50c08f8199c036422db5dad70656ea914c09d8eb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-05  Martin Rudalics  <rudalics@gmx.at>
+
+       * xdisp.c (note_mouse_highlight): When entering a margin area show
+       a non-text cursor (Bug#16647).
+
 2014-02-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        * menu.c (Fx_popup_dialog): Remove label 'dialog_via_menu'.

diff --git a/src/xdisp.c b/src/xdisp.c
index 0ca877d997f02d05038af4c0b6338b9d7fa5552c..f9c1b4d1bf00de99f58a05bff7f1fb77a82ee2c3 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -28568,7 +28568,15 @@ note_mouse_highlight (struct frame *f, int x, int y)
       || part == ON_LEFT_MARGIN || part == ON_RIGHT_MARGIN)
     {
       note_mode_line_or_margin_highlight (window, x, y, part);
-      return;
+
+      if (part == ON_LEFT_MARGIN || part == ON_RIGHT_MARGIN)
+       {
+         cursor = FRAME_X_OUTPUT (f)->nontext_cursor;
+         /* Sho non-text cursor (Bug#16647).  */
+         goto set_cursor;
+       }
+      else
+       return;
     }
 
 #ifdef HAVE_WINDOW_SYSTEM