/[emacs]/emacs/src/xdisp.c
ViewVC logotype

Diff of /emacs/src/xdisp.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.843.2.26 by handa, Mon Oct 4 01:23:35 2004 UTC revision 1.843.2.27 by miles, Thu Oct 14 08:49:53 2004 UTC
# Line 216  extern int pending_menu_activation; Line 216  extern int pending_menu_activation;
216  extern int interrupt_input;  extern int interrupt_input;
217  extern int command_loop_level;  extern int command_loop_level;
218    
219    extern Lisp_Object do_mouse_tracking;
220    
221  extern int minibuffer_auto_raise;  extern int minibuffer_auto_raise;
222  extern Lisp_Object Vminibuffer_list;  extern Lisp_Object Vminibuffer_list;
223    
# Line 10517  redisplay_preserve_echo_area (from_where Line 10519  redisplay_preserve_echo_area (from_where
10519      }      }
10520    else    else
10521      redisplay_internal (1);      redisplay_internal (1);
10522    
10523      if (rif != NULL && rif->flush_display_optional)
10524        rif->flush_display_optional (NULL);
10525  }  }
10526    
10527    
# Line 12320  redisplay_window (window, just_this_one_ Line 12325  redisplay_window (window, just_this_one_
12325      {      {
12326        update_begin (f);        update_begin (f);
12327        BLOCK_INPUT;        BLOCK_INPUT;
12328        draw_window_fringes (w);        if (draw_window_fringes (w, 1))
12329            x_draw_vertical_border (w);
12330        UNBLOCK_INPUT;        UNBLOCK_INPUT;
12331        update_end (f);        update_end (f);
12332      }      }
# Line 18800  calc_line_height_property (it, prop, fon Line 18806  calc_line_height_property (it, prop, fon
18806    
18807    if (STRINGP (it->object))    if (STRINGP (it->object))
18808      position = make_number (IT_STRING_CHARPOS (*it));      position = make_number (IT_STRING_CHARPOS (*it));
18809    else    else if (BUFFERP (it->object))
18810      position = make_number (IT_CHARPOS (*it));      position = make_number (IT_CHARPOS (*it));
18811      else
18812        return Qnil;
18813    
18814    val = Fget_char_property (position, prop, it->object);    val = Fget_char_property (position, prop, it->object);
18815    
# Line 20912  define_frame_cursor1 (f, cursor, pointer Line 20920  define_frame_cursor1 (f, cursor, pointer
20920       Cursor cursor;       Cursor cursor;
20921       Lisp_Object pointer;       Lisp_Object pointer;
20922  {  {
20923      /* Do not change cursor shape while dragging mouse.  */
20924      if (!NILP (do_mouse_tracking))
20925        return;
20926    
20927    if (!NILP (pointer))    if (!NILP (pointer))
20928      {      {
20929        if (EQ (pointer, Qarrow))        if (EQ (pointer, Qarrow))
# Line 21773  x_draw_vertical_border (w) Line 21785  x_draw_vertical_border (w)
21785       do it for frames with vertical scroll bars because either the       do it for frames with vertical scroll bars because either the
21786       right scroll bar of a window, or the left scroll bar of its       right scroll bar of a window, or the left scroll bar of its
21787       neighbor will suffice as a border.  */       neighbor will suffice as a border.  */
21788      if (FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (w->frame)))
21789        return;
21790    
21791    if (!WINDOW_RIGHTMOST_P (w)    if (!WINDOW_RIGHTMOST_P (w)
21792        && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))        && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
21793      {      {

Legend:
Removed from v.1.843.2.26  
changed lines
  Added in v.1.843.2.27

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26