aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2015-06-30 18:59:21 +0300
committerEli Zaretskii2015-06-30 18:59:21 +0300
commitedd09381c618125d8aa23c9414034fbeee176305 (patch)
tree009641f2aad95cc9852b06b036a4e6a9f143be94 /src
parent881c4790266c42805ac1b9a5f1bbe13d3dd23478 (diff)
downloademacs-edd09381c618125d8aa23c9414034fbeee176305.tar.gz
emacs-edd09381c618125d8aa23c9414034fbeee176305.zip
Don't block changes in mouse pointer inside 'track-mouse'
* etc/NEWS: * doc/lispref/frames.texi (Mouse Tracking): Document the special effect of setting 'track-mouse' to 'dragging'. * lisp/textmodes/artist.el (artist-mouse-draw-continously): * lisp/ruler-mode.el (ruler-mode-mouse-drag-any-column-iteration): * lisp/mouse-drag.el (mouse-drag-throw): * lisp/mouse.el (mouse-drag-line): Set 'track-mouse' to 'dragging' to avoid changes in the shape of the mouse pointer. * src/xdisp.c (define_frame_cursor1): Don't change the mouse pointer shape when do_mouse_tracking has the value of 'dragging', not just any non-nil value. (Bug#20934) (syms_of_xdisp): DEFSYM 'dragging'.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 25eed01ecfc..5bef44c6e51 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -29105,7 +29105,7 @@ static void
29105define_frame_cursor1 (struct frame *f, Cursor cursor, Lisp_Object pointer) 29105define_frame_cursor1 (struct frame *f, Cursor cursor, Lisp_Object pointer)
29106{ 29106{
29107 /* Do not change cursor shape while dragging mouse. */ 29107 /* Do not change cursor shape while dragging mouse. */
29108 if (!NILP (do_mouse_tracking)) 29108 if (EQ (do_mouse_tracking, Qdragging))
29109 return; 29109 return;
29110 29110
29111 if (!NILP (pointer)) 29111 if (!NILP (pointer))
@@ -30727,6 +30727,8 @@ They are still logged to the *Messages* buffer. */);
30727 DEFSYM (Qarrow, "arrow"); 30727 DEFSYM (Qarrow, "arrow");
30728 /* also Qtext */ 30728 /* also Qtext */
30729 30729
30730 DEFSYM (Qdragging, "dragging");
30731
30730 DEFSYM (Qinhibit_free_realized_faces, "inhibit-free-realized-faces"); 30732 DEFSYM (Qinhibit_free_realized_faces, "inhibit-free-realized-faces");
30731 30733
30732 list_of_error = list1 (list2 (Qerror, Qvoid_variable)); 30734 list_of_error = list1 (list2 (Qerror, Qvoid_variable));