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

[Ken Raeburn]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.763 emacs/src/xdisp.c:1.764
*** emacs/src/xdisp.c:1.763     Thu Jul 11 13:36:07 2002
--- emacs/src/xdisp.c   Sun Jul 14 20:00:37 2002
***************
*** 3698,3704 ****
        it->stop_charpos = 0;
        xassert (STRINGP (it->string));
        it->end_charpos = SCHARS (it->string);
!       it->multibyte_p = SMBP (it->string);
        it->method = next_element_from_string;
      }
    else
--- 3698,3704 ----
        it->stop_charpos = 0;
        xassert (STRINGP (it->string));
        it->end_charpos = SCHARS (it->string);
!       it->multibyte_p = STRING_MULTIBYTE (it->string);
        it->method = next_element_from_string;
      }
    else
***************
*** 6102,6110 ****
          message = Fformat (2, args);
  
          if (log)
!           message3 (message, SBYTES (message), SMBP (message));
          else
!           message3_nolog (message, SBYTES (message), SMBP (message));
  
          UNGCPRO;
  
--- 6102,6110 ----
          message = Fformat (2, args);
  
          if (log)
!           message3 (message, SBYTES (message), STRING_MULTIBYTE (message));
          else
!           message3_nolog (message, SBYTES (message), STRING_MULTIBYTE 
(message));
  
          UNGCPRO;
  
***************
*** 6824,6830 ****
    xassert (CONSP (Vmessage_stack));
    msg = XCAR (Vmessage_stack);
    if (STRINGP (msg))
!     message3_nolog (msg, SBYTES (msg), SMBP (msg));
    else
      message3_nolog (msg, 0, 0);
  }
--- 6824,6830 ----
    xassert (CONSP (Vmessage_stack));
    msg = XCAR (Vmessage_stack);
    if (STRINGP (msg))
!     message3_nolog (msg, SBYTES (msg), STRING_MULTIBYTE (msg));
    else
      message3_nolog (msg, 0, 0);
  }