aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKen Brown2010-11-21 10:46:23 -0500
committerKen Brown2010-11-21 10:46:23 -0500
commit731e263a732a84174bf324f48720e4645ab4b9b1 (patch)
tree25c2461ae021c9575fced225b091e4124eed6daf /src
parent0e941dcee29df5890e5659f75b0b6e15161c30b4 (diff)
downloademacs-731e263a732a84174bf324f48720e4645ab4b9b1.tar.gz
emacs-731e263a732a84174bf324f48720e4645ab4b9b1.zip
* src/sheap.c (STATIC_HEAP_SIZE): Revert previous change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/sheap.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8a77fc15792..44dc63fd424 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-11-21 Ken Brown <kbrown@cornell.edu>
2
3 * sheap.c (STATIC_HEAP_SIZE): Revert previous change.
4
12010-11-21 Jan Djärv <jan.h.d@swipnet.se> 52010-11-21 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * nsterm.m (ns_right_command_modifier, ns_right_control_modifier): 7 * nsterm.m (ns_right_command_modifier, ns_right_control_modifier):
diff --git a/src/sheap.c b/src/sheap.c
index e972462d423..8d034ff65aa 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -25,7 +25,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
25 25
26#include <unistd.h> 26#include <unistd.h>
27 27
28#define STATIC_HEAP_SIZE (13 * 1024 * 1024) 28#define STATIC_HEAP_SIZE (12 * 1024 * 1024)
29 29
30int debug_sheap = 0; 30int debug_sheap = 0;
31 31