/[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.754.2.33 by miles, Wed Oct 6 05:23:55 2004 UTC revision 1.754.2.34 by miles, Mon Oct 25 04:19:35 2004 UTC
# Line 215  extern int pending_menu_activation; Line 215  extern int pending_menu_activation;
215  extern int interrupt_input;  extern int interrupt_input;
216  extern int command_loop_level;  extern int command_loop_level;
217    
218    extern Lisp_Object do_mouse_tracking;
219    
220  extern int minibuffer_auto_raise;  extern int minibuffer_auto_raise;
221  extern Lisp_Object Vminibuffer_list;  extern Lisp_Object Vminibuffer_list;
222    
# Line 4895  get_next_display_element (it) Line 4897  get_next_display_element (it)
4897                             && it->len == 1)                             && it->len == 1)
4898                            || !CHAR_PRINTABLE_P (it->c))                            || !CHAR_PRINTABLE_P (it->c))
4899                         : (it->c >= 127                         : (it->c >= 127
4900                            && it->c == unibyte_char_to_multibyte (it->c))))                            && (!unibyte_display_via_language_environment
4901                                  || it->c == unibyte_char_to_multibyte (it->c)))))
4902              {              {
4903                /* IT->c is a control character which must be displayed                /* IT->c is a control character which must be displayed
4904                   either as '\003' or as `^C' where the '\\' and '^'                   either as '\003' or as `^C' where the '\\' and '^'
# Line 10404  redisplay_preserve_echo_area (from_where Line 10407  redisplay_preserve_echo_area (from_where
10407      }      }
10408    else    else
10409      redisplay_internal (1);      redisplay_internal (1);
10410    
10411      if (rif != NULL && rif->flush_display_optional)
10412        rif->flush_display_optional (NULL);
10413  }  }
10414    
10415    
# Line 12218  redisplay_window (window, just_this_one_ Line 12224  redisplay_window (window, just_this_one_
12224      {      {
12225        update_begin (f);        update_begin (f);
12226        BLOCK_INPUT;        BLOCK_INPUT;
12227        draw_window_fringes (w);        if (draw_window_fringes (w, 1))
12228            x_draw_vertical_border (w);
12229        UNBLOCK_INPUT;        UNBLOCK_INPUT;
12230        update_end (f);        update_end (f);
12231      }      }
# Line 18692  calc_line_height_property (it, prop, fon Line 18699  calc_line_height_property (it, prop, fon
18699    
18700    if (STRINGP (it->object))    if (STRINGP (it->object))
18701      position = make_number (IT_STRING_CHARPOS (*it));      position = make_number (IT_STRING_CHARPOS (*it));
18702    else    else if (BUFFERP (it->object))
18703      position = make_number (IT_CHARPOS (*it));      position = make_number (IT_CHARPOS (*it));
18704      else
18705        return Qnil;
18706    
18707    val = Fget_char_property (position, prop, it->object);    val = Fget_char_property (position, prop, it->object);
18708    
# Line 20764  define_frame_cursor1 (f, cursor, pointer Line 20773  define_frame_cursor1 (f, cursor, pointer
20773       Cursor cursor;       Cursor cursor;
20774       Lisp_Object pointer;       Lisp_Object pointer;
20775  {  {
20776      /* Do not change cursor shape while dragging mouse.  */
20777      if (!NILP (do_mouse_tracking))
20778        return;
20779    
20780    if (!NILP (pointer))    if (!NILP (pointer))
20781      {      {
20782        if (EQ (pointer, Qarrow))        if (EQ (pointer, Qarrow))
# Line 21625  x_draw_vertical_border (w) Line 21638  x_draw_vertical_border (w)
21638       do it for frames with vertical scroll bars because either the       do it for frames with vertical scroll bars because either the
21639       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
21640       neighbor will suffice as a border.  */       neighbor will suffice as a border.  */
21641      if (FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (w->frame)))
21642        return;
21643    
21644    if (!WINDOW_RIGHTMOST_P (w)    if (!WINDOW_RIGHTMOST_P (w)
21645        && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))        && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
21646      {      {

Legend:
Removed from v.1.754.2.33  
changed lines
  Added in v.1.754.2.34

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