If USE_LOCAL_ALLOCATORS, allocate some Lisp objects on stack.

* lisp.h (local_cons, local_list1, local_list2, local_list3)
[USE_LOCAL_ALLOCATORS]: New macros.
[!USE_LOCAL_ALLOCATORS]: Fall back to regular functions.
(build_local_string): Avoid argument name expansion clash with
make_local_string.
* alloc.c (toplevel)
[USE_LOCAL_ALLOCATORS && GC_MARK_STACK != GC_MAKE_GCPROS_NOOPS]:
Preprocessor guard to avoid impossible configuration.
* charset.c (Ffind_charset_region, Ffind_charset_string):
Use make_local_vector.
* lread.c (read1, substitute_object_recurse): Use scoped_cons.
* textprop.c (Fput_text_property, Fadd_face_text_property):
Use scoped_list2.
(copy_text_properties): Use local_cons and local_list3.
* chartab.c (uniprop_table):
* data.c (wrong_choice, wrong_range):
* doc.c (get_doc_string):
* editfns.c (format2):
* fileio.c (Fexpand_file_name, auto_save_error):
* fns.c (Fyes_or_no_p):
* font.c (font_parse_xlfd, font_parse_family_registry, font_add_log):
* fontset.c (Fset_fontset_font):
* keyboard.c (echo_add_key, echo_dash, parse_menu_item)
(read_char_minibuf_menu_prompt):
* keymap.c (silly_event_symbol_error, describe_vector):
* menu.c (single_menu_item):
* minibuf.c (Fread_buffer):
* process.c (status_message, Fformat_network_address)
(server_accept_connection): Use make_local_string and
build_local_string.  Prefer compound literals where appropriate.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index c435ba74faa..a114aa27626 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -566,14 +566,14 @@ echo_add_key (Lisp_Object c)
       if (XINT (last_char) == '-' && XINT (prev_char) != ' ')
         Faset (echo_string, idx, make_number (' '));
       else
-        echo_string = concat2 (echo_string, build_string (" "));
+        echo_string = concat2 (echo_string, build_local_string (" "));
     }
   else if (STRINGP (echo_string) && SCHARS (echo_string) > 0)
-    echo_string = concat2 (echo_string, build_string (" "));
+    echo_string = concat2 (echo_string, build_local_string (" "));
 
   kset_echo_string
     (current_kboard,
-     concat2 (echo_string, make_string (buffer, ptr - buffer)));
+     concat2 (echo_string, make_local_string (buffer, ptr - buffer)));
   SAFE_FREE ();
 }
 
@@ -632,7 +632,7 @@ echo_dash (void)
      but make it go away when the next character is added.  */
   kset_echo_string
     (current_kboard,
-     concat2 (KVAR (current_kboard, echo_string), build_string ("-")));
+     concat2 (KVAR (current_kboard, echo_string), build_local_string ("-")));
   echo_now ();
 }
 
@@ -7883,7 +7883,8 @@ parse_menu_item (Lisp_Object item, int inmenubar)
     /* The previous code preferred :key-sequence to :keys, so we
        preserve this behavior.  */
     if (STRINGP (keyeq) && !CONSP (keyhint))
-      keyeq = concat2 (build_string ("  "), Fsubstitute_command_keys (keyeq));
+      keyeq = concat2 (build_local_string ("  "),
+                       Fsubstitute_command_keys (keyeq));
     else
       {
         Lisp_Object prefix = keyeq;
@@ -7926,8 +7927,7 @@ parse_menu_item (Lisp_Object item, int inmenubar)
                 if (STRINGP (XCDR (prefix)))
                   tem = concat2 (tem, XCDR (prefix));
               }
-            keyeq = concat2 (build_string ("  "), tem);
-            /* keyeq = concat3(build_string("  ("),tem,build_string(")")); */
+            keyeq = concat2 (build_local_string ("  "), tem);
           }
         else
           keyeq = Qnil;
@@ -8632,9 +8632,9 @@ read_char_minibuf_menu_prompt (int commandflag,
                       Lisp_Object selected
                         = AREF (item_properties, ITEM_PROPERTY_SELECTED);
                       if (EQ (tem, QCradio))
-                        tem = build_string (NILP (selected) ? "(*) " : "( ) ");
+                        tem = build_local_string (NILP (selected) ? "(*) " : "( ) ");
                       else
-                        tem = build_string (NILP (selected) ? "[X] " : "[ ] ");
+                        tem = build_local_string (NILP (selected) ? "[X] " : "[ ] ");
                       s = concat2 (tem, s);
                     }