[Emacs-diffs] /srv/bzr/emacs/trunk r111831: * sheap.c (report_sheap_usage): Use message, not message1, so

[dancol]

------------------------------------------------------------
revno: 111831 [merge]
committer: address@hidden
branch nick: realtrunk
timestamp: Tue 2013-02-19 21:56:28 -0800
message:
  * sheap.c (report_sheap_usage): Use message, not message1, so
    that we don't try to create a buffer while we're in the middle
    of dumping Emacs.  Explain why.
modified:
  src/ChangeLog
  src/sheap.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-02-20 05:18:20 +0000
+++ b/src/ChangeLog     2013-02-20 05:56:28 +0000
@@ -1,5 +1,8 @@
+2013-02-19  Daniel Colascione <address@hidden>
+       * sheap.c (report_sheap_usage): Use message, not message1, so
+       that we don't try to create a buffer while we're in the middle
+       of dumping Emacs.  Explain why.
 2013-02-20  Dmitry Antipov  <address@hidden>
-
        * search.c (find_newline): Return byte position in bytepos.
        Adjust comment.
        (find_next_newline_no_quit, find_before_next_newline): Add

=== modified file 'src/sheap.c'
--- a/src/sheap.c       2013-02-17 16:49:27 +0000
+++ b/src/sheap.c       2013-02-20 05:43:53 +0000
@@ -91,5 +91,8 @@
   char buf[200];
   sprintf (buf, "Static heap usage: %d of %d bytes",
           bss_sbrk_ptr - bss_sbrk_buffer, STATIC_HEAP_SIZE);
-  message1 (buf);
+  /* Don't change this call to message1! message1 can log
+     messages, and at this point, we're not allowed to create
+     buffers.  */
+  message ("%s", buf);
 }