aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Colascione2013-02-19 21:56:28 -0800
committerDaniel Colascione2013-02-19 21:56:28 -0800
commit618185046817f98751c558d19bc1396b1eba612b (patch)
tree45338121013f451621ab23e8fc4d3f3e6e27ea22 /src
parent2a14a4f13cdb22f5b6b0840081d977c8d38a91e6 (diff)
parentd69f1120d8cfcb02f952003ab5a9e0a44dcd0151 (diff)
downloademacs-618185046817f98751c558d19bc1396b1eba612b.tar.gz
emacs-618185046817f98751c558d19bc1396b1eba612b.zip
* 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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/sheap.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7396ccb3759..b04b344edf2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12013-02-19 Daniel Colascione <dancol@dancol.org>
2 * sheap.c (report_sheap_usage): Use message, not message1, so
3 that we don't try to create a buffer while we're in the middle
4 of dumping Emacs. Explain why.
12013-02-20 Dmitry Antipov <dmantipov@yandex.ru> 52013-02-20 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * search.c (find_newline): Return byte position in bytepos. 6 * search.c (find_newline): Return byte position in bytepos.
4 Adjust comment. 7 Adjust comment.
5 (find_next_newline_no_quit, find_before_next_newline): Add 8 (find_next_newline_no_quit, find_before_next_newline): Add
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)
91 char buf[200]; 91 char buf[200];
92 sprintf (buf, "Static heap usage: %d of %d bytes", 92 sprintf (buf, "Static heap usage: %d of %d bytes",
93 bss_sbrk_ptr - bss_sbrk_buffer, STATIC_HEAP_SIZE); 93 bss_sbrk_ptr - bss_sbrk_buffer, STATIC_HEAP_SIZE);
94 message1 (buf); 94 /* Don't change this call to message1! message1 can log
95 messages, and at this point, we're not allowed to create
96 buffers. */
97 message ("%s", buf);
95} 98}