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

[Juanma Barranquero]

Index: emacs/src/print.c
diff -c emacs/src/print.c:1.183 emacs/src/print.c:1.184
*** emacs/src/print.c:1.183     Sun Oct 13 21:30:26 2002
--- emacs/src/print.c   Tue Feb  4 09:03:13 2003
***************
*** 189,195 ****
     and must start with PRINTPREPARE, end with PRINTFINISH,
     and use PRINTDECLARE to declare common variables.
     Use PRINTCHAR to output one character,
!    or call strout to output a block of characters. */ 
  
  #define PRINTDECLARE                                                  \
     struct buffer *old = current_buffer;                                       
\
--- 189,195 ----
     and must start with PRINTPREPARE, end with PRINTFINISH,
     and use PRINTDECLARE to declare common variables.
     Use PRINTCHAR to output one character,
!    or call strout to output a block of characters. */
  
  #define PRINTDECLARE                                                  \
     struct buffer *old = current_buffer;                                       
\
***************
*** 321,327 ****
        int len = CHAR_STRING (ch, str);
  
        QUIT;
!       
        if (NILP (fun))
        {
          if (print_buffer_pos_byte + len >= print_buffer_size)
--- 321,327 ----
        int len = CHAR_STRING (ch, str);
  
        QUIT;
! 
        if (NILP (fun))
        {
          if (print_buffer_pos_byte + len >= print_buffer_size)
***************
*** 340,346 ****
        {
          int multibyte_p
            = !NILP (current_buffer->enable_multibyte_characters);
!         
          setup_echo_area_for_printing (multibyte_p);
          insert_char (ch);
          message_dolog (str, len, 0, multibyte_p);
--- 340,346 ----
        {
          int multibyte_p
            = !NILP (current_buffer->enable_multibyte_characters);
! 
          setup_echo_area_for_printing (multibyte_p);
          insert_char (ch);
          message_dolog (str, len, 0, multibyte_p);
***************
*** 397,406 ****
        int i;
        int multibyte_p
        = !NILP (current_buffer->enable_multibyte_characters);
!       
        setup_echo_area_for_printing (multibyte_p);
        message_dolog (ptr, size_byte, 0, multibyte_p);
!       
        if (size == size_byte)
        {
          for (i = 0; i < size; ++i)
--- 397,406 ----
        int i;
        int multibyte_p
        = !NILP (current_buffer->enable_multibyte_characters);
! 
        setup_echo_area_for_printing (multibyte_p);
        message_dolog (ptr, size_byte, 0, multibyte_p);
! 
        if (size == size_byte)
        {
          for (i = 0; i < size; ++i)
***************
*** 415,421 ****
              insert_char (ch);
            }
        }
!       
  #ifdef MAX_PRINT_CHARS
        if (max_print)
          print_chars += size;
--- 415,421 ----
              insert_char (ch);
            }
        }
! 
  #ifdef MAX_PRINT_CHARS
        if (max_print)
          print_chars += size;
***************
*** 653,659 ****
  
  If variable `temp-buffer-show-function' is non-nil, call it at the end
  to get the buffer displayed instead of just displaying the non-selected
! buffer and calling the hook.  It gets one argument, the buffer to display.  
  
  usage: (with-output-to-temp-buffer BUFFNAME BODY ...)  */)
       (args)
--- 653,659 ----
  
  If variable `temp-buffer-show-function' is non-nil, call it at the end
  to get the buffer displayed instead of just displaying the non-selected
! buffer and calling the hook.  It gets one argument, the buffer to display.
  
  usage: (with-output-to-temp-buffer BUFFNAME BODY ...)  */)
       (args)
***************
*** 1005,1011 ****
        else
        Fprin1 (obj, stream);
      }
!   
    UNGCPRO;
  }
  
--- 1005,1011 ----
        else
        Fprin1 (obj, stream);
      }
! 
    UNGCPRO;
  }
  
***************
*** 1016,1024 ****
   * largest float, printed in the biggest notation.  This is undoubtedly
   * 20d float_output_format, with the negative of the C-constant "HUGE"
   * from <math.h>.
!  * 
   * On the vax the worst case is -1e38 in 20d format which takes 61 bytes.
!  * 
   * I assume that IEEE-754 format numbers can take 329 bytes for the worst
   * case of -1e307 in 20d float_output_format. What is one to do (short of
   * re-writing _doprnt to be more sane)?
--- 1016,1024 ----
   * largest float, printed in the biggest notation.  This is undoubtedly
   * 20d float_output_format, with the negative of the C-constant "HUGE"
   * from <math.h>.
!  *
   * On the vax the worst case is -1e38 in 20d format which takes 61 bytes.
!  *
   * I assume that IEEE-754 format numbers can take 329 bytes for the worst
   * case of -1e307 in 20d float_output_format. What is one to do (short of
   * re-writing _doprnt to be more sane)?
***************
*** 1032,1038 ****
  {
    unsigned char *cp;
    int width;
!       
    /* Check for plus infinity in a way that won't lose
       if there is no plus infinity.  */
    if (data == data / 2 && data > 1.0)
--- 1032,1038 ----
  {
    unsigned char *cp;
    int width;
! 
    /* Check for plus infinity in a way that won't lose
       if there is no plus infinity.  */
    if (data == data / 2 && data > 1.0)
***************
*** 1061,1067 ****
            *buf++ = '-';
            break;
          }
!       
        strcpy (buf, "0.0e+NaN");
        return;
      }
--- 1061,1067 ----
            *buf++ = '-';
            break;
          }
! 
        strcpy (buf, "0.0e+NaN");
        return;
      }
***************
*** 1598,1604 ****
        else
        {
          PRINTCHAR ('(');
!         
          /* If the first element is a backquote form,
             print it old-style so it won't be misunderstood.  */
          if (print_quoted && CONSP (XCAR (obj))
--- 1598,1604 ----
        else
        {
          PRINTCHAR ('(');
! 
          /* If the first element is a backquote form,
             print it old-style so it won't be misunderstood.  */
          if (print_quoted && CONSP (XCAR (obj))
***************
*** 1670,1687 ****
                            }
                      }
                  }
!               
                if (i++)
                  PRINTCHAR (' ');
!               
                if (print_length && i > print_length)
                  {
                    strout ("...", 3, 3, printcharfun, 0);
                    goto end_of_list;
                  }
!               
                print_object (XCAR (obj), printcharfun, escapeflag);
!               
                obj = XCDR (obj);
                if (!(i & 1))
                  halftail = XCDR (halftail);
--- 1670,1687 ----
                            }
                      }
                  }
! 
                if (i++)
                  PRINTCHAR (' ');
! 
                if (print_length && i > print_length)
                  {
                    strout ("...", 3, 3, printcharfun, 0);
                    goto end_of_list;
                  }
! 
                print_object (XCAR (obj), printcharfun, escapeflag);
! 
                obj = XCDR (obj);
                if (!(i & 1))
                  halftail = XCDR (halftail);
***************
*** 1694,1700 ****
              strout (" . ", 3, 3, printcharfun, 0);
              print_object (obj, printcharfun, escapeflag);
            }
!         
        end_of_list:
          PRINTCHAR (')');
        }
--- 1694,1700 ----
              strout (" . ", 3, 3, printcharfun, 0);
              print_object (obj, printcharfun, escapeflag);
            }
! 
        end_of_list:
          PRINTCHAR (')');
        }