aboutsummaryrefslogtreecommitdiffstats
path: root/src/image.c
diff options
context:
space:
mode:
authorPo Lu2024-05-09 14:58:45 +0800
committerPo Lu2024-05-09 15:07:22 +0800
commit67ab6bcdbac572a6266d7c9d15833bd2ddd049fa (patch)
tree3469eaa3f625da33e3c5c5e0e91cc5c202552c81 /src/image.c
parent9b7dd30807ed4be9afe4f66cfa5130aa7d178989 (diff)
downloademacs-67ab6bcdbac572a6266d7c9d15833bd2ddd049fa.tar.gz
emacs-67ab6bcdbac572a6266d7c9d15833bd2ddd049fa.zip
Replace calls to intern with a constant string with DEFSYMs
* src/alloc.c (display_malloc_warning, syms_of_alloc): * src/buffer.c (Fmake_indirect_buffer, Fbuffer_local_variables) (Frename_buffer, Fkill_buffer, Fset_buffer_major_mode) (Fset_buffer_multibyte, syms_of_buffer): * src/callint.c (read_file_name, Fcall_interactively) (syms_of_callint): * src/callproc.c (call_process, create_temp_file) (syms_of_callproc): * src/charset.c (Fdefine_charset_internal, syms_of_charset): * src/cmds.c (internal_self_insert, syms_of_cmds): * src/coding.c (record_conversion_result) (Fdefine_coding_system_internal, syms_of_coding): * src/dbusbind.c (xd_signature, Fdbus_message_internal) (syms_of_dbusbind): * src/dispnew.c (init_faces_initial): * src/doc.c (Fsnarf_documentation, syms_of_doc): * src/dosfns.c (system_process_attributes, syms_of_dosfns): * src/emacs.c (init_cmdargs, Fdump_emacs, decode_env_path) (syms_of_emacs): * src/eval.c (call_debugger, Fdefvaralias, syms_of_eval): * src/fileio.c (barf_or_query_if_file_exists) (Finsert_file_contents, auto_save_error, Fdo_auto_save) (syms_of_fileio): * src/filelock.c (lock_file_1, syms_of_filelock): * src/fontset.c (fontset_from_font, syms_of_fontset): * src/frame.c (make_frame_without_minibuffer, syms_of_frame): * src/gnutls.c (emacs_gnutls_certificate_details) (Fgnutls_peer_status_warning_describe, Fgnutls_peer_status) (gnutls_verify_boot, syms_of_gnutls): * src/gtkutil.c (style_changed_cb, find_rtl_image): * src/image.c (imagemagick_filename_hint, gs_load) (syms_of_image): * src/keyboard.c (command_loop_1, read_char, timer_start_idle) (read_char_minibuf_menu_prompt, Fsuspend_emacs) (syms_of_keyboard): * src/keymap.c (Fmap_keymap, Flookup_key, Fdescribe_vector) (describe_vector, syms_of_keymap): * src/lread.c (Fread, Fread_positioning_symbols, syms_of_lread): * src/minibuf.c (Fabort_minibuffers, Fread_buffer) (Fcompleting_read, syms_of_minibuf): * src/msdos.c (XMenuActivate, run_msdos_command, syms_of_msdos): * src/nsfns.m (Fx_display_backing_store, Fx_display_visual_class) (Fns_hide_emacs, Fsystem_move_file_to_trash, ns_create_tip_frame) (x_hide_tip, Fx_show_tip, syms_of_nsfns): * src/nsfont.m (ns_spec_to_descriptor, ns_descriptor_to_entity) (syms_of_nsfont): * src/pdumper.c (Fdump_emacs_portable): * src/pgtkfns.c (Fx_display_visual_class, x_create_tip_frame) (Fx_show_tip, syms_of_pgtkfns): * src/pgtkterm.c (syms_of_pgtkterm, pgtk_cr_export_frames): * src/term.c (term_get_fkeys_1, set_tty_color_mode, Fsuspend_tty) (Fresume_tty, tty_menu_activate, syms_of_term): * src/terminal.c (create_terminal, syms_of_terminal): * src/w32fns.c (Fx_display_backing_store) (Fx_display_visual_class, Fset_message_beep, Fx_open_connection) (Fx_show_tip, Fx_file_dialog, Fsystem_move_file_to_trash) (Fw32_toggle_lock_key, syms_of_w32fns): * src/w32font.c (w32_enumfont_pattern_entity, syms_of_w32font): * src/w32term.c (w32_bitmap_icon, syms_of_w32term): * src/xdisp.c (message_dolog, define_frame_cursor1) (syms_of_xdisp): * src/xfaces.c (tty_lookup_color, syms_of_xfaces): * src/xml.c (make_dom, syms_of_xml): * src/xterm.c (syms_of_xterm): * src/xwidget.c (store_xwidget_download_callback_event) (store_xwidget_js_callback_event, syms_of_xwidget): Define symbols for symbols interned with `intern' from a constant string, delete duplicate DEFSYM directives, and substitute them for such calls to intern. This excludes only those symbols which are interned and referenced only once during Emacs's initialization, the timing of whose interning is inconsequential, and symbols in w32.c, which would need to be transferred to a new syms_of_w32 function that I cannot test.
Diffstat (limited to 'src/image.c')
-rw-r--r--src/image.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/image.c b/src/image.c
index b15d68bf9bf..e93fc3183af 100644
--- a/src/image.c
+++ b/src/image.c
@@ -10721,14 +10721,14 @@ imagemagick_error (MagickWand *wand)
10721static char * 10721static char *
10722imagemagick_filename_hint (Lisp_Object spec, char hint_buffer[MaxTextExtent]) 10722imagemagick_filename_hint (Lisp_Object spec, char hint_buffer[MaxTextExtent])
10723{ 10723{
10724 Lisp_Object symbol = intern ("image-format-suffixes"); 10724 Lisp_Object symbol = Qimage_format_suffixes;
10725 Lisp_Object val = find_symbol_value (symbol); 10725 Lisp_Object val = find_symbol_value (symbol);
10726 Lisp_Object format; 10726 Lisp_Object format;
10727 10727
10728 if (! CONSP (val)) 10728 if (! CONSP (val))
10729 return NULL; 10729 return NULL;
10730 10730
10731 format = image_spec_value (spec, intern (":format"), NULL); 10731 format = image_spec_value (spec, QCformat, NULL);
10732 val = Fcar_safe (Fcdr_safe (Fassq (format, val))); 10732 val = Fcar_safe (Fcdr_safe (Fassq (format, val)));
10733 if (! STRINGP (val)) 10733 if (! STRINGP (val))
10734 return NULL; 10734 return NULL;
@@ -12477,7 +12477,7 @@ gs_load (struct frame *f, struct image *img)
12477 XSETFRAME (frame, f); 12477 XSETFRAME (frame, f);
12478 loader = image_spec_value (img->spec, QCloader, NULL); 12478 loader = image_spec_value (img->spec, QCloader, NULL);
12479 if (NILP (loader)) 12479 if (NILP (loader))
12480 loader = intern ("gs-load-image"); 12480 loader = Qgs_load_image;
12481 12481
12482 img->lisp_data = call6 (loader, frame, img->spec, 12482 img->lisp_data = call6 (loader, frame, img->spec,
12483 make_fixnum (img->width), 12483 make_fixnum (img->width),
@@ -12853,6 +12853,7 @@ non-numeric, there is no explicit limit on the size of images. */);
12853 DEFSYM (QCloader, ":loader"); 12853 DEFSYM (QCloader, ":loader");
12854 DEFSYM (QCpt_width, ":pt-width"); 12854 DEFSYM (QCpt_width, ":pt-width");
12855 DEFSYM (QCpt_height, ":pt-height"); 12855 DEFSYM (QCpt_height, ":pt-height");
12856 DEFSYM (Qgs_load_image, "gs-load-image");
12856#endif /* HAVE_GHOSTSCRIPT */ 12857#endif /* HAVE_GHOSTSCRIPT */
12857 12858
12858#ifdef HAVE_NTGUI 12859#ifdef HAVE_NTGUI
@@ -13032,5 +13033,8 @@ The options are:
13032*/); 13033*/);
13033 /* MagickExportImagePixels is in 6.4.6-9, but not 6.4.4-10. */ 13034 /* MagickExportImagePixels is in 6.4.6-9, but not 6.4.4-10. */
13034 imagemagick_render_type = 0; 13035 imagemagick_render_type = 0;
13035#endif 13036
13037 DEFSYM (Qimage_format_suffixes, "image-format-suffixes");
13038 DEFSYM (QCformat, ":format");
13039#endif /* HAVE_IMAGEMAGICK */
13036} 13040}