* frame.c (make_initial_frame):

* buffer.c (init_buffer_once): Use make_pure_c_string instead of
build_string.
* alloc.c (syms_of_alloc): Build Vmemory_signal_data in pure memory.

4 files changed, 9 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b174073a82f..c3d4e291242 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2009-11-11  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * frame.c (make_initial_frame):
+        * buffer.c (init_buffer_once): Use make_pure_c_string instead of
+        build_string.
+        * alloc.c (syms_of_alloc): Build Vmemory_signal_data in pure memory.
+
         * s/freebsd.h:
         * s/netbsd.h: Remove code referring to non-existent file: unexsunos4.o.
 
diff --git a/src/alloc.c b/src/alloc.c
index 6241cde424b..b009157cc33 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6401,8 +6401,8 @@ This means that certain objects should be allocated in shared (pure) space.  */)
   /* We build this in advance because if we wait until we need it, we might
      not be able to allocate the memory to hold it.  */
   Vmemory_signal_data
-    = list2 (Qerror,
-             build_string ("Memory exhausted--use M-x save-some-buffers then exit and restart Emacs"));
+    = pure_cons (Qerror,
+                 pure_cons (make_pure_c_string ("Memory exhausted--use M-x save-some-buffers then exit and restart Emacs"), Qnil));
 
   DEFVAR_LISP ("memory-full", &Vmemory_full,
                doc: /* Non-nil means Emacs cannot get much more Lisp memory.  */);
diff --git a/src/buffer.c b/src/buffer.c
index c4e90363c6a..8edea2d8728 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5302,7 +5302,7 @@ init_buffer_once ()
   current_buffer = 0;
   all_buffers = 0;
 
-  QSFundamental = build_string ("Fundamental");
+  QSFundamental = make_pure_c_string ("Fundamental");
 
   Qfundamental_mode = intern_c_string ("fundamental-mode");
   buffer_defaults.major_mode = Qfundamental_mode;
diff --git a/src/frame.c b/src/frame.c
index b3c3b83735b..467f6bd1482 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -543,7 +543,7 @@ make_initial_frame (void)
   Vframe_list = Fcons (frame, Vframe_list);
 
   tty_frame_count = 1;
-  f->name = build_string ("F1");
+  f->name = make_pure_c_string ("F1");
 
   f->visible = 1;
   f->async_visible = 1;