diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-06-30 18:59:21 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-06-30 18:59:21 +0300 |
| commit | edd09381c618125d8aa23c9414034fbeee176305 (patch) | |
| tree | 009641f2aad95cc9852b06b036a4e6a9f143be94 /src | |
| parent | 881c4790266c42805ac1b9a5f1bbe13d3dd23478 (diff) | |
| download | emacs-edd09381c618125d8aa23c9414034fbeee176305.tar.gz | |
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.c | 4 |
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 define_frame_cursor1 (struct frame *f, Cursor cursor, Lisp_Object pointer) { /* Do not change cursor shape while dragging mouse. */ - if (!NILP (do_mouse_tracking)) + if (EQ (do_mouse_tracking, Qdragging)) return; if (!NILP (pointer)) @@ -30727,6 +30727,8 @@ They are still logged to the *Messages* buffer. */); DEFSYM (Qarrow, "arrow"); /* also Qtext */ + DEFSYM (Qdragging, "dragging"); + DEFSYM (Qinhibit_free_realized_faces, "inhibit-free-realized-faces"); list_of_error = list1 (list2 (Qerror, Qvoid_variable)); |