summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2014-02-05 10:24:55 +0100
committerMartin Rudalics <rudalics@gmx.at>2014-02-05 10:24:55 +0100
commitfa49abf8bfb67ebab4c92bca656380948317a273 (patch)
tree444eab6fba32936aeee6e0493f870b48f3e2e26e /src
parent451ea3e6cca50a905550a27b8b49bc6a8bff7a2b (diff)
downloademacs-fa49abf8bfb67ebab4c92bca656380948317a273.tar.gz
emacs-fa49abf8bfb67ebab4c92bca656380948317a273.tar.bz2
emacs-fa49abf8bfb67ebab4c92bca656380948317a273.zip
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).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xdisp.c10
2 files changed, 14 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1ef4d9fc816..50c08f8199c 100644
--- 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 0ca877d997f..f9c1b4d1bf0 100644
--- 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