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/data.c | |
| parent | 497daa12743ed71a70e41f966631d1c8856248cc (diff) | |
| download | emacs-edb0288b83b45d295df52ce7644e897613358971.tar.gz emacs-edb0288b83b45d295df52ce7644e897613358971.tar.bz2 emacs-edb0288b83b45d295df52ce7644e897613358971.zip | |
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/data.c')
| -rw-r--r-- | src/data.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/data.c b/src/data.c index 5b8e01e2950..2d6d4c7c22b 100644 --- a/src/data.c +++ b/src/data.c @@ -988,8 +988,9 @@ wrong_choice (Lisp_Object choice, Lisp_Object wrong) for (obj = choice; !NILP (obj); obj = XCDR (obj)) { args[i++] = SYMBOL_NAME (XCAR (obj)); - args[i++] = build_string (NILP (XCDR (obj)) ? " should be specified" - : (NILP (XCDR (XCDR (obj))) ? " or " : ", ")); + args[i++] = build_local_string + (NILP (XCDR (obj)) ? " should be specified" + : (NILP (XCDR (XCDR (obj))) ? " or " : ", ")); } obj = Fconcat (i, args); @@ -1003,14 +1004,11 @@ wrong_choice (Lisp_Object choice, Lisp_Object wrong) static void wrong_range (Lisp_Object min, Lisp_Object max, Lisp_Object wrong) { - Lisp_Object args[4]; - - args[0] = build_string ("Value should be from "); - args[1] = Fnumber_to_string (min); - args[2] = build_string (" to "); - args[3] = Fnumber_to_string (max); - - xsignal2 (Qerror, Fconcat (4, args), wrong); + xsignal2 (Qerror, Fconcat (4, ((Lisp_Object []) + { build_local_string ("Value should be from "), + Fnumber_to_string (min), + build_local_string (" to "), + Fnumber_to_string (max) })), wrong); } /* Store NEWVAL into SYMBOL, where VALCONTENTS is found in the value cell |