Commit 5c809195 authored by Martin Rudalics's avatar Martin Rudalics
Browse files

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).
parent d63ae2e4
2014-02-28 Martin Rudalics <rudalics@gmx.at>
* 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 <rgm@gnu.org>
* doc.c (Fsnarf_documentation): Snarf not-yet-bound variables
......
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment