[Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind]

[Miles Bader]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.754.2.33 emacs/src/xdisp.c:1.754.2.34
*** emacs/src/xdisp.c:1.754.2.33        Wed Oct  6 05:23:55 2004
--- emacs/src/xdisp.c   Mon Oct 25 04:19:35 2004
***************
*** 215,220 ****
--- 215,222 ----
  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;
  
***************
*** 4895,4901 ****
                           && it->len == 1)
                          || !CHAR_PRINTABLE_P (it->c))
                       : (it->c >= 127
!                         && it->c == unibyte_char_to_multibyte (it->c))))
            {
              /* IT->c is a control character which must be displayed
                 either as '\003' or as `^C' where the '\\' and '^'
--- 4897,4904 ----
                           && it->len == 1)
                          || !CHAR_PRINTABLE_P (it->c))
                       : (it->c >= 127
!                         && (!unibyte_display_via_language_environment
!                             || it->c == unibyte_char_to_multibyte (it->c)))))
            {
              /* IT->c is a control character which must be displayed
                 either as '\003' or as `^C' where the '\\' and '^'
***************
*** 10404,10409 ****
--- 10407,10415 ----
      }
    else
      redisplay_internal (1);
+ 
+   if (rif != NULL && rif->flush_display_optional)
+     rif->flush_display_optional (NULL);
  }
  
  
***************
*** 12218,12224 ****
      {
        update_begin (f);
        BLOCK_INPUT;
!       draw_window_fringes (w);
        UNBLOCK_INPUT;
        update_end (f);
      }
--- 12224,12231 ----
      {
        update_begin (f);
        BLOCK_INPUT;
!       if (draw_window_fringes (w, 1))
!       x_draw_vertical_border (w);
        UNBLOCK_INPUT;
        update_end (f);
      }
***************
*** 18692,18699 ****
  
    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);
  
--- 18699,18708 ----
  
    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);
  
***************
*** 20764,20769 ****
--- 20773,20782 ----
       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))
***************
*** 21625,21630 ****
--- 21638,21646 ----
       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))
      {