[Emacs-diffs] trunk r116269: Fix cursor appearance in note_mouse_highlight (Bug#16647).

[Martin Rudalics]

------------------------------------------------------------
revno: 116269
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Wed 2014-02-05 10:24:55 +0100
message:
  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).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-02-04 19:24:09 +0000
+++ b/src/ChangeLog     2014-02-05 09:24:55 +0000
@@ -1,3 +1,8 @@
+2014-02-05  Martin Rudalics  <address@hidden>
+
+       * xdisp.c (note_mouse_highlight): When entering a margin area show
+       a non-text cursor (Bug#16647).
+
 2014-02-04  Paul Eggert  <address@hidden>
 
        * menu.c (Fx_popup_dialog): Remove label 'dialog_via_menu'.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2014-02-04 07:36:58 +0000
+++ b/src/xdisp.c       2014-02-05 09:24:55 +0000
@@ -28568,7 +28568,15 @@
       || 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