comparison src/print.c @ 42423:fe55eaa5dfb3

(print_object): In multibyte string, use hex escapes. Use octal only for unibyte strings. (PRINTPREPARE): Don't ever set Qprint_escape_nonascii.

42422:d0809974975f

     {									\
       Lisp_Object string;						\
       if (NILP (current_buffer->enable_multibyte_characters)		\
	   && ! print_escape_multibyte)					\
         specbind (Qprint_escape_multibyte, Qt);			\
       if (! NILP (current_buffer->enable_multibyte_characters)		\
	   && ! print_escape_nonascii)					\
         specbind (Qprint_escape_nonascii, Qt);				\
       if (print_buffer != 0)						\
	 {								\
	   string = make_string_from_bytes (print_buffer,		\
					    print_buffer_pos,		\
					    print_buffer_pos_byte);	\

	  unsigned char *str;
	  int size_byte;
	  /* 1 means we must ensure that the next character we output
	     cannot be taken as part of a hex character escape.  */
	  int need_nonhex = 0;

	  GCPRO1 (obj);

	  if (!NULL_INTERVAL_P (XSTRING (obj)->intervals))
	    {

	      /* Here, we must convert each multi-byte form to the
		 corresponding character code before handing it to PRINTCHAR.  */
	      int len;
	      int c;

	      if (STRING_MULTIBYTE (obj))
		{
		  c = STRING_CHAR_AND_LENGTH (str + i_byte,
					      size_byte - i_byte, len);
		  if (CHAR_VALID_P (c, 0))
		    i_byte += len;

	      else if (c == '\f' && print_escape_newlines)
		{
		  PRINTCHAR ('\\');
		  PRINTCHAR ('f');
		}
	      else if (! SINGLE_BYTE_CHAR_P (c) && print_escape_multibyte)
		{
		  /* When multibyte is disabled,
		     print multibyte string chars using hex escapes.  */
		  unsigned char outbuf[50];
		  sprintf (outbuf, "\\x%x", c);
		  strout (outbuf, -1, -1, printcharfun, 0);
		  need_nonhex = 1;
		}
	      else if (SINGLE_BYTE_CHAR_P (c) && ! ASCII_BYTE_P (c)
		       && print_escape_nonascii)
		{
		  /* When printing in a multibyte buffer
		     or when explicitly requested,
		     print single-byte non-ASCII string chars

42423:fe55eaa5dfb3

     {									\
       Lisp_Object string;						\
       if (NILP (current_buffer->enable_multibyte_characters)		\
	   && ! print_escape_multibyte)					\
         specbind (Qprint_escape_multibyte, Qt);			\
       if (print_buffer != 0)						\
	 {								\
	   string = make_string_from_bytes (print_buffer,		\
					    print_buffer_pos,		\
					    print_buffer_pos_byte);	\

	  unsigned char *str;
	  int size_byte;
	  /* 1 means we must ensure that the next character we output
	     cannot be taken as part of a hex character escape.  */
	  int need_nonhex = 0;
	  int multibyte = STRING_MULTIBYTE (obj);

	  GCPRO1 (obj);

	  if (!NULL_INTERVAL_P (XSTRING (obj)->intervals))
	    {

	      /* Here, we must convert each multi-byte form to the
		 corresponding character code before handing it to PRINTCHAR.  */
	      int len;
	      int c;

	      if (multibyte)
		{
		  c = STRING_CHAR_AND_LENGTH (str + i_byte,
					      size_byte - i_byte, len);
		  if (CHAR_VALID_P (c, 0))
		    i_byte += len;

	      else if (c == '\f' && print_escape_newlines)
		{
		  PRINTCHAR ('\\');
		  PRINTCHAR ('f');
		}
	      else if (multibyte && ! ASCII_BYTE_P (c)
		       && (print_escape_multibyte || print_escape_nonascii))
		{
		  /* When multibyte is disabled,
		     print multibyte string chars using hex escapes.  */
		  unsigned char outbuf[50];
		  sprintf (outbuf, "\\x%x", c);
		  strout (outbuf, -1, -1, printcharfun, 0);
		  need_nonhex = 1;
		}
	      else if (! multibyte
		       && SINGLE_BYTE_CHAR_P (c) && ! ASCII_BYTE_P (c)
		       && print_escape_nonascii)
		{
		  /* When printing in a multibyte buffer
		     or when explicitly requested,
		     print single-byte non-ASCII string chars