From 5c809195983367031c8c6a2eea0842c34f334b33 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Fri, 28 Feb 2014 11:32:11 +0100 Subject: [PATCH] Don't show drag cursor when modeline can't be dragged (Bug#16647). * xdisp.c (note_mode_line_or_margin_highlight): Don't show drag cursor when modeline can't be dragged (Bug#16647). --- src/ChangeLog | 5 +++++ src/xdisp.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 75dfdf71bd5..d2eeab33e4f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-02-28 Martin Rudalics + + * xdisp.c (note_mode_line_or_margin_highlight): Don't show drag + cursor when modeline can't be dragged (Bug#16647). + 2014-02-28 Glenn Morris * doc.c (Fsnarf_documentation): Snarf not-yet-bound variables diff --git a/src/xdisp.c b/src/xdisp.c index 33c99cd596b..b8e08a30e1c 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -28449,6 +28449,10 @@ note_mode_line_or_margin_highlight (Lisp_Object window, int x, int y, /* Change the mouse pointer according to what is under it. */ if (FRAME_WINDOW_P (f)) { + bool draggable = (! WINDOW_BOTTOMMOST_P (w) + || minibuf_level + || NILP (Vresize_mini_windows)); + dpyinfo = FRAME_DISPLAY_INFO (f); if (STRINGP (string)) { @@ -28465,11 +28469,11 @@ note_mode_line_or_margin_highlight (Lisp_Object window, int x, int y, map = Fget_text_property (pos, Qlocal_map, string); if (!KEYMAPP (map)) map = Fget_text_property (pos, Qkeymap, string); - if (!KEYMAPP (map)) + if (!KEYMAPP (map) && draggable) cursor = dpyinfo->vertical_scroll_bar_cursor; } } - else + else if (draggable) /* Default mode-line pointer. */ cursor = FRAME_DISPLAY_INFO (f)->vertical_scroll_bar_cursor; } -- 2.39.2