diff options
author | Dmitry Antipov <dmantipov@yandex.ru> | 2014-09-15 18:53:23 +0400 |
---|---|---|
committer | Dmitry Antipov <dmantipov@yandex.ru> | 2014-09-15 18:53:23 +0400 |
commit | edb0288b83b45d295df52ce7644e897613358971 (patch) | |
tree | 8f169c257e9752ca860764cc19ec232d287eb189 /src/fns.c | |
parent | 497daa12743ed71a70e41f966631d1c8856248cc (diff) | |
download | emacs-edb0288b83b45d295df52ce7644e897613358971.tar.gz |
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.
Diffstat (limited to 'src/fns.c')
-rw-r--r-- | src/fns.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/fns.c b/src/fns.c index bbff9b6d554..9f56a8f01f5 100644 --- a/src/fns.c +++ b/src/fns.c @@ -2706,7 +2706,6 @@ if `last-nonmenu-event' is nil, and `use-dialog-box' is non-nil. */) (Lisp_Object prompt) { register Lisp_Object ans; - Lisp_Object args[2]; struct gcpro gcpro1; CHECK_STRING (prompt); @@ -2725,10 +2724,8 @@ if `last-nonmenu-event' is nil, and `use-dialog-box' is non-nil. */) return obj; } - args[0] = prompt; - args[1] = build_string ("(yes or no) "); - prompt = Fconcat (2, args); - + prompt = Fconcat (2, ((Lisp_Object []) + { prompt, build_local_string ("(yes or no) ") })); GCPRO1 (prompt); while (1) |