[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116609: Don't show drag cursor when modeline can't
From: |
Martin Rudalics |
Subject: |
[Emacs-diffs] trunk r116609: Don't show drag cursor when modeline can't be dragged (Bug#16647). |
Date: |
Fri, 28 Feb 2014 10:32:24 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116609
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Fri 2014-02-28 11:32:11 +0100
message:
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).
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/xdisp.c xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-02-28 02:00:17 +0000
+++ b/src/ChangeLog 2014-02-28 10:32:11 +0000
@@ -1,3 +1,8 @@
+2014-02-28 Martin Rudalics <address@hidden>
+
+ * 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 <address@hidden>
* doc.c (Fsnarf_documentation): Snarf not-yet-bound variables
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2014-02-27 19:22:10 +0000
+++ b/src/xdisp.c 2014-02-28 10:32:11 +0000
@@ -28449,6 +28449,10 @@
/* 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 @@
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;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116609: Don't show drag cursor when modeline can't be dragged (Bug#16647).,
Martin Rudalics <=