[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c [emacs-unicode-2] |
Date: |
Thu, 14 Oct 2004 05:13:32 -0400 |
Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.843.2.26 emacs/src/xdisp.c:1.843.2.27
*** emacs/src/xdisp.c:1.843.2.26 Mon Oct 4 01:23:35 2004
--- emacs/src/xdisp.c Thu Oct 14 08:49:53 2004
***************
*** 216,221 ****
--- 216,223 ----
extern int interrupt_input;
extern int command_loop_level;
+ extern Lisp_Object do_mouse_tracking;
+
extern int minibuffer_auto_raise;
extern Lisp_Object Vminibuffer_list;
***************
*** 10517,10522 ****
--- 10519,10527 ----
}
else
redisplay_internal (1);
+
+ if (rif != NULL && rif->flush_display_optional)
+ rif->flush_display_optional (NULL);
}
***************
*** 12320,12326 ****
{
update_begin (f);
BLOCK_INPUT;
! draw_window_fringes (w);
UNBLOCK_INPUT;
update_end (f);
}
--- 12325,12332 ----
{
update_begin (f);
BLOCK_INPUT;
! if (draw_window_fringes (w, 1))
! x_draw_vertical_border (w);
UNBLOCK_INPUT;
update_end (f);
}
***************
*** 18800,18807 ****
if (STRINGP (it->object))
position = make_number (IT_STRING_CHARPOS (*it));
! else
position = make_number (IT_CHARPOS (*it));
val = Fget_char_property (position, prop, it->object);
--- 18806,18815 ----
if (STRINGP (it->object))
position = make_number (IT_STRING_CHARPOS (*it));
! else if (BUFFERP (it->object))
position = make_number (IT_CHARPOS (*it));
+ else
+ return Qnil;
val = Fget_char_property (position, prop, it->object);
***************
*** 20912,20917 ****
--- 20920,20929 ----
Cursor cursor;
Lisp_Object pointer;
{
+ /* Do not change cursor shape while dragging mouse. */
+ if (!NILP (do_mouse_tracking))
+ return;
+
if (!NILP (pointer))
{
if (EQ (pointer, Qarrow))
***************
*** 21773,21778 ****
--- 21785,21793 ----
do it for frames with vertical scroll bars because either the
right scroll bar of a window, or the left scroll bar of its
neighbor will suffice as a border. */
+ if (FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (w->frame)))
+ return;
+
if (!WINDOW_RIGHTMOST_P (w)
&& !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
{