diff options
| author | Kim F. Storm | 2004-10-04 13:57:13 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2004-10-04 13:57:13 +0000 |
| commit | 562020fe6f943c77000fdaa2b3def3ea633fc1b1 (patch) | |
| tree | 7877be035c4bf1ee6ecf682a33bb5e5df0117b48 /src | |
| parent | cb639b8f7c64fff917e85d8f96431f95959d969c (diff) | |
| download | emacs-562020fe6f943c77000fdaa2b3def3ea633fc1b1.tar.gz emacs-562020fe6f943c77000fdaa2b3def3ea633fc1b1.zip | |
(define_frame_cursor1): Do not change frame cursor
while tracking/dragging mouse.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c5ac065b132..d6a7624de20 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2004-10-04 Kim F. Storm <storm@cua.dk> | 1 | 2004-10-04 Kim F. Storm <storm@cua.dk> |
| 2 | 2 | ||
| 3 | * xdisp.c (define_frame_cursor1): Do not change frame cursor | ||
| 4 | while tracking/dragging mouse. | ||
| 5 | (x_draw_vertical_border): Do not draw line if frame has scroll bars. | ||
| 6 | |||
| 3 | * window.c (coordinates_in_window): Relax check for cursor | 7 | * window.c (coordinates_in_window): Relax check for cursor |
| 4 | on vertial border between mode lines. | 8 | on vertial border between mode lines. |
| 5 | (Fset_window_fringes): Do not allow negative widths. | 9 | (Fset_window_fringes): Do not allow negative widths. |
diff --git a/src/xdisp.c b/src/xdisp.c index ddd247b3430..82fa97c5190 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -215,6 +215,8 @@ extern int pending_menu_activation; | |||
| 215 | extern int interrupt_input; | 215 | extern int interrupt_input; |
| 216 | extern int command_loop_level; | 216 | extern int command_loop_level; |
| 217 | 217 | ||
| 218 | extern Lisp_Object do_mouse_tracking; | ||
| 219 | |||
| 218 | extern int minibuffer_auto_raise; | 220 | extern int minibuffer_auto_raise; |
| 219 | extern Lisp_Object Vminibuffer_list; | 221 | extern Lisp_Object Vminibuffer_list; |
| 220 | 222 | ||
| @@ -20764,6 +20766,10 @@ define_frame_cursor1 (f, cursor, pointer) | |||
| 20764 | Cursor cursor; | 20766 | Cursor cursor; |
| 20765 | Lisp_Object pointer; | 20767 | Lisp_Object pointer; |
| 20766 | { | 20768 | { |
| 20769 | /* Do not change cursor shape while dragging mouse. */ | ||
| 20770 | if (!NILP (do_mouse_tracking)) | ||
| 20771 | return; | ||
| 20772 | |||
| 20767 | if (!NILP (pointer)) | 20773 | if (!NILP (pointer)) |
| 20768 | { | 20774 | { |
| 20769 | if (EQ (pointer, Qarrow)) | 20775 | if (EQ (pointer, Qarrow)) |