comparison src/xdisp.c @ 83213:d83f49cefda3

Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-593 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-594 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-595 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-596 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-597 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-598 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-599 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-600 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-601 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-602 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-603 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-42 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-43 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-44 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-253
author Karoly Lorentey <lorentey@elte.hu>
date Thu, 07 Oct 2004 16:52:19 +0000
parents f70dc61a797f 6fd660640e42
children 4f2f1522636c
comparison
equal deleted inserted replaced
83212:f70dc61a797f 83213:d83f49cefda3
212 extern int pending_menu_activation; 212 extern int pending_menu_activation;
213 #endif 213 #endif
214 214
215 extern int interrupt_input; 215 extern int interrupt_input;
216 extern int command_loop_level; 216 extern int command_loop_level;
217
218 extern Lisp_Object do_mouse_tracking;
217 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
221 extern Lisp_Object Qface; 223 extern Lisp_Object Qface;
20760 define_frame_cursor1 (f, cursor, pointer) 20762 define_frame_cursor1 (f, cursor, pointer)
20761 struct frame *f; 20763 struct frame *f;
20762 Cursor cursor; 20764 Cursor cursor;
20763 Lisp_Object pointer; 20765 Lisp_Object pointer;
20764 { 20766 {
20767 /* Do not change cursor shape while dragging mouse. */
20768 if (!NILP (do_mouse_tracking))
20769 return;
20770
20765 if (!NILP (pointer)) 20771 if (!NILP (pointer))
20766 { 20772 {
20767 if (EQ (pointer, Qarrow)) 20773 if (EQ (pointer, Qarrow))
20768 cursor = FRAME_X_OUTPUT (f)->nontext_cursor; 20774 cursor = FRAME_X_OUTPUT (f)->nontext_cursor;
20769 else if (EQ (pointer, Qhand)) 20775 else if (EQ (pointer, Qhand))
21623 21629
21624 /* Redraw borders between horizontally adjacent windows. Don't 21630 /* Redraw borders between horizontally adjacent windows. Don't
21625 do it for frames with vertical scroll bars because either the 21631 do it for frames with vertical scroll bars because either the
21626 right scroll bar of a window, or the left scroll bar of its 21632 right scroll bar of a window, or the left scroll bar of its
21627 neighbor will suffice as a border. */ 21633 neighbor will suffice as a border. */
21634 if (FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (w->frame)))
21635 return;
21636
21628 if (!WINDOW_RIGHTMOST_P (w) 21637 if (!WINDOW_RIGHTMOST_P (w)
21629 && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w)) 21638 && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
21630 { 21639 {
21631 int x0, x1, y0, y1; 21640 int x0, x1, y0, y1;
21632 21641