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).

diff --git a/src/ChangeLog b/src/ChangeLog
index 75dfdf71bd56aa23f80c508302ae9fc3cf175697..d2eeab33e4f51bca84c9355ae71eaf9f2e58f620 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/src/xdisp.c b/src/xdisp.c
index 33c99cd596b586611fb360a7233317c5eb71adfb..b8e08a30e1c0e9964b8aa0dd8bfc1fe5669a98b2 100644 (file)
--- 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;
        }