From: Daniel Colascione <dancol@dancol.org>
Date: Wed, 20 Feb 2013 05:43:53 +0000 (-0800)
Subject: 2013-02-19  Daniel Colascione <dancol@dancol.org>
X-Git-Tag: emacs-24.3.90~173^2~6^2~88^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d69f1120d8cfcb02f952003ab5a9e0a44dcd0151;p=emacs.git

2013-02-19  Daniel Colascione <dancol@dancol.org>

        * 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.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ff059cf1a3c..720f3f28943 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-19  Daniel Colascione <dancol@dancol.org>
+
+	* 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-19  Eli Zaretskii  <eliz@gnu.org>
 
 	* w32proc.c (new_child): Avoid leaking handles if the subprocess
diff --git a/src/sheap.c b/src/sheap.c
index 06e205bc0e5..9e6b7fb1cf1 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -91,5 +91,8 @@ report_sheap_usage (int die_if_pure_storage_exceeded)
   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);
 }