aboutsummaryrefslogtreecommitdiffstats
path: root/src/font.c
diff options
context:
space:
mode:
authorDmitry Antipov2014-09-15 18:53:23 +0400
committerDmitry Antipov2014-09-15 18:53:23 +0400
commitedb0288b83b45d295df52ce7644e897613358971 (patch)
tree8f169c257e9752ca860764cc19ec232d287eb189 /src/font.c
parent497daa12743ed71a70e41f966631d1c8856248cc (diff)
downloademacs-edb0288b83b45d295df52ce7644e897613358971.tar.gz
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/font.c')
-rw-r--r--src/font.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/font.c b/src/font.c
index 412cd3f938d..57cc4aa0b2b 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1190,12 +1190,12 @@ font_parse_xlfd (char *name, ptrdiff_t len, Lisp_Object font)
1190 { 1190 {
1191 val = prop[XLFD_ENCODING_INDEX]; 1191 val = prop[XLFD_ENCODING_INDEX];
1192 if (! NILP (val)) 1192 if (! NILP (val))
1193 val = concat2 (build_string ("*-"), SYMBOL_NAME (val)); 1193 val = concat2 (build_local_string ("*-"), SYMBOL_NAME (val));
1194 } 1194 }
1195 else if (NILP (prop[XLFD_ENCODING_INDEX])) 1195 else if (NILP (prop[XLFD_ENCODING_INDEX]))
1196 val = concat2 (SYMBOL_NAME (val), build_string ("-*")); 1196 val = concat2 (SYMBOL_NAME (val), build_local_string ("-*"));
1197 else 1197 else
1198 val = concat3 (SYMBOL_NAME (val), build_string ("-"), 1198 val = concat3 (SYMBOL_NAME (val), build_local_string ("-"),
1199 SYMBOL_NAME (prop[XLFD_ENCODING_INDEX])); 1199 SYMBOL_NAME (prop[XLFD_ENCODING_INDEX]));
1200 if (! NILP (val)) 1200 if (! NILP (val))
1201 ASET (font, FONT_REGISTRY_INDEX, Fintern (val, Qnil)); 1201 ASET (font, FONT_REGISTRY_INDEX, Fintern (val, Qnil));
@@ -1793,9 +1793,9 @@ font_parse_family_registry (Lisp_Object family, Lisp_Object registry, Lisp_Objec
1793 if (! p1) 1793 if (! p1)
1794 { 1794 {
1795 if (SDATA (registry)[len - 1] == '*') 1795 if (SDATA (registry)[len - 1] == '*')
1796 registry = concat2 (registry, build_string ("-*")); 1796 registry = concat2 (registry, build_local_string ("-*"));
1797 else 1797 else
1798 registry = concat2 (registry, build_string ("*-*")); 1798 registry = concat2 (registry, build_local_string ("*-*"));
1799 } 1799 }
1800 registry = Fdowncase (registry); 1800 registry = Fdowncase (registry);
1801 ASET (font_spec, FONT_REGISTRY_INDEX, Fintern (registry, Qnil)); 1801 ASET (font_spec, FONT_REGISTRY_INDEX, Fintern (registry, Qnil));
@@ -5022,7 +5022,7 @@ font_add_log (const char *action, Lisp_Object arg, Lisp_Object result)
5022 if (FONTP (arg)) 5022 if (FONTP (arg))
5023 { 5023 {
5024 Lisp_Object tail, elt; 5024 Lisp_Object tail, elt;
5025 Lisp_Object equalstr = build_string ("="); 5025 Lisp_Object equalstr = build_local_string ("=");
5026 5026
5027 val = Ffont_xlfd_name (arg, Qt); 5027 val = Ffont_xlfd_name (arg, Qt);
5028 for (tail = AREF (arg, FONT_EXTRA_INDEX); CONSP (tail); 5028 for (tail = AREF (arg, FONT_EXTRA_INDEX); CONSP (tail);
@@ -5056,7 +5056,7 @@ font_add_log (const char *action, Lisp_Object arg, Lisp_Object result)
5056 val = Ffont_xlfd_name (result, Qt); 5056 val = Ffont_xlfd_name (result, Qt);
5057 if (! FONT_SPEC_P (result)) 5057 if (! FONT_SPEC_P (result))
5058 val = concat3 (SYMBOL_NAME (AREF (result, FONT_TYPE_INDEX)), 5058 val = concat3 (SYMBOL_NAME (AREF (result, FONT_TYPE_INDEX)),
5059 build_string (":"), val); 5059 build_local_string (":"), val);
5060 result = val; 5060 result = val;
5061 } 5061 }
5062 else if (CONSP (result)) 5062 else if (CONSP (result))