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

[Richard M. Stallman]

Index: emacs/src/print.c
diff -c emacs/src/print.c:1.169 emacs/src/print.c:1.170
*** emacs/src/print.c:1.169     Sun Nov 25 19:08:20 2001
--- emacs/src/print.c   Sat Dec 29 22:22:55 2001
***************
*** 226,234 ****
         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,               \
--- 226,231 ----
***************
*** 1384,1389 ****
--- 1381,1387 ----
          /* 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);
  
***************
*** 1404,1410 ****
              int len;
              int c;
  
!             if (STRING_MULTIBYTE (obj))
                {
                  c = STRING_CHAR_AND_LENGTH (str + i_byte,
                                              size_byte - i_byte, len);
--- 1402,1408 ----
              int len;
              int c;
  
!             if (multibyte)
                {
                  c = STRING_CHAR_AND_LENGTH (str + i_byte,
                                              size_byte - i_byte, len);
***************
*** 1428,1434 ****
                  PRINTCHAR ('\\');
                  PRINTCHAR ('f');
                }
!             else if (! SINGLE_BYTE_CHAR_P (c) && print_escape_multibyte)
                {
                  /* When multibyte is disabled,
                     print multibyte string chars using hex escapes.  */
--- 1426,1433 ----
                  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.  */
***************
*** 1437,1443 ****
                  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
--- 1436,1443 ----
                  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