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

[Juanma Barranquero]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.787 emacs/src/xdisp.c:1.788
*** emacs/src/xdisp.c:1.787     Sun Sep 29 13:44:16 2002
--- emacs/src/xdisp.c   Fri Oct 18 05:52:44 2002
***************
*** 1531,1537 ****
  
    /* If face attributes have been changed since the last redisplay,
       free realized faces now because they depend on face definitions
!      that might have changed.  Don't free faces while there might be 
       desired matrices pending which reference these faces.  */
    if (face_change_count && !inhibit_free_realized_faces)
      {
--- 1531,1537 ----
  
    /* If face attributes have been changed since the last redisplay,
       free realized faces now because they depend on face definitions
!      that might have changed.  Don't free faces while there might be
       desired matrices pending which reference these faces.  */
    if (face_change_count && !inhibit_free_realized_faces)
      {
***************
*** 4215,4221 ****
  get_next_display_element (it)
       struct it *it;
  {
!   /* Non-zero means that we found an display element.  Zero means that
       we hit the end of what we iterate over.  Performance note: the
       function pointer `method' used here turns out to be faster than
       using a sequence of if-statements.  */
--- 4215,4221 ----
  get_next_display_element (it)
       struct it *it;
  {
!   /* Non-zero means that we found a display element.  Zero means that
       we hit the end of what we iterate over.  Performance note: the
       function pointer `method' used here turns out to be faster than
       using a sequence of if-statements.  */
***************
*** 9033,9039 ****
                                 redisplay_window_error);
  
        /* Compare desired and current matrices, perform output.  */
!       
      update:
        /* If fonts changed, display again.  */
        if (fonts_changed_p)
--- 9033,9039 ----
                                 redisplay_window_error);
  
        /* Compare desired and current matrices, perform output.  */
! 
      update:
        /* If fonts changed, display again.  */
        if (fonts_changed_p)
***************
*** 13751,13757 ****
  
     PROPS is a property list to add to any string we encounter.
  
!    If RISKY is nonzero, remove (disregard) any properties in any string 
     we encounter, and ignore :eval and :propertize.
  
     If the global variable `frame_title_ptr' is non-NULL, then the output
--- 13751,13757 ----
  
     PROPS is a property list to add to any string we encounter.
  
!    If RISKY is nonzero, remove (disregard) any properties in any string
     we encounter, and ignore :eval and :propertize.
  
     If the global variable `frame_title_ptr' is non-NULL, then the output
***************
*** 14165,14171 ****
     If COPY_STRING is non-zero, make a copy of LISP_STRING before adding
     properties to the string.
  
!    PROPS are the properties to add to the string.  
     The mode_line_string_face face property is always added to the string.
   */
  
--- 14165,14171 ----
     If COPY_STRING is non-zero, make a copy of LISP_STRING before adding
     properties to the string.
  
!    PROPS are the properties to add to the string.
     The mode_line_string_face face property is always added to the string.
   */
  
***************
*** 14201,14207 ****
        Fadd_text_properties (make_number (0), make_number (len),
                            props, lisp_string);
      }
!   else 
      {
        len = XFASTINT (Flength (lisp_string));
        if (precision > 0 && len > precision)
--- 14201,14207 ----
        Fadd_text_properties (make_number (0), make_number (len),
                            props, lisp_string);
      }
!   else
      {
        len = XFASTINT (Flength (lisp_string));
        if (precision > 0 && len > precision)
***************
*** 14232,14238 ****
    if (len > 0)
      {
        mode_line_string_list = Fcons (lisp_string, mode_line_string_list);
!       n += len; 
      }
  
    if (field_width > len)
--- 14232,14238 ----
    if (len > 0)
      {
        mode_line_string_list = Fcons (lisp_string, mode_line_string_list);
!       n += len;
      }
  
    if (field_width > len)
***************
*** 14243,14249 ****
        Fadd_text_properties (make_number (0), make_number (field_width),
                              props, lisp_string);
        mode_line_string_list = Fcons (lisp_string, mode_line_string_list);
!       n += field_width; 
      }
  
    return n;
--- 14243,14249 ----
        Fadd_text_properties (make_number (0), make_number (field_width),
                              props, lisp_string);
        mode_line_string_list = Fcons (lisp_string, mode_line_string_list);
!       n += field_width;
      }
  
    return n;
***************
*** 14305,14311 ****
        /* We need a dummy last element in mode_line_string_list to
         indicate we are building the propertized mode-line string.
         Using mode_line_string_face_prop here GC protects it.  */
!       mode_line_string_list = 
        Fcons (mode_line_string_face_prop, Qnil);
        frame_title_ptr = NULL;
      }
--- 14305,14311 ----
        /* We need a dummy last element in mode_line_string_list to
         indicate we are building the propertized mode-line string.
         Using mode_line_string_face_prop here GC protects it.  */
!       mode_line_string_list =
        Fcons (mode_line_string_face_prop, Qnil);
        frame_title_ptr = NULL;
      }
***************
*** 15214,15220 ****
       int *width;
  {
    enum text_cursor_kinds type;
!   
    if (NILP (arg))
      return NO_CURSOR;
  
--- 15214,15220 ----
       int *width;
  {
    enum text_cursor_kinds type;
! 
    if (NILP (arg))
      return NO_CURSOR;
  
***************
*** 15369,15376 ****
        *width = FRAME_BLINK_OFF_CURSOR_WIDTH (f);
        return FRAME_BLINK_OFF_CURSOR (f);
      }
!   
!   /* Finally perform built-in cursor blinking: 
         filled box      <->   hollow box
         wide [h]bar     <->   narrow [h]bar
         narrow [h]bar   <->   no cursor
--- 15369,15376 ----
        *width = FRAME_BLINK_OFF_CURSOR_WIDTH (f);
        return FRAME_BLINK_OFF_CURSOR (f);
      }
! 
!   /* Finally perform built-in cursor blinking:
         filled box      <->   hollow box
         wide [h]bar     <->   narrow [h]bar
         narrow [h]bar   <->   no cursor