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.

1 files changed, 11 insertions, 7 deletions

diff --git a/src/dbusbind.c b/src/dbusbind.c
index 0441b07a3b2..9f93f2894c2 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -474,7 +474,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
           subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt));
           xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt)));
           if (strcmp (subsig, x) != 0)
-            wrong_type_argument (intern ("D-Bus"), CAR_SAFE (elt));
+            wrong_type_argument (QD_Bus, CAR_SAFE (elt));
           elt = CDR_SAFE (XD_NEXT_VALUE (elt));
         }
 
@@ -493,7 +493,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
       xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt)));
 
       if (!NILP (CDR_SAFE (XD_NEXT_VALUE (elt))))
-        wrong_type_argument (intern ("D-Bus"),
+        wrong_type_argument (QD_Bus,
                              CAR_SAFE (CDR_SAFE (XD_NEXT_VALUE (elt))));
 
       sprintf (signature, "%c", dtype);
@@ -528,7 +528,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
 
       /* Check the parent object type.  */
       if (parent_type != DBUS_TYPE_ARRAY)
-        wrong_type_argument (intern ("D-Bus"), object);
+        wrong_type_argument (QD_Bus, object);
 
       /* Compose the signature from the elements.  It is enclosed by
          curly braces.  */
@@ -542,7 +542,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
       xd_signature_cat (signature, x);
 
       if (!XD_BASIC_DBUS_TYPE (subtype))
-        wrong_type_argument (intern ("D-Bus"), CAR_SAFE (XD_NEXT_VALUE (elt)));
+        wrong_type_argument (QD_Bus, CAR_SAFE (XD_NEXT_VALUE (elt)));
 
       /* Second element.  */
       elt = CDR_SAFE (XD_NEXT_VALUE (elt));
@@ -552,7 +552,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
       xd_signature_cat (signature, x);
 
       if (!NILP (CDR_SAFE (XD_NEXT_VALUE (elt))))
-        wrong_type_argument (intern ("D-Bus"),
+        wrong_type_argument (QD_Bus,
                              CAR_SAFE (CDR_SAFE (XD_NEXT_VALUE (elt))));
 
       /* Closing signature.  */
@@ -560,7 +560,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
       break;
 
     default:
-      wrong_type_argument (intern ("D-Bus"), object);
+      wrong_type_argument (QD_Bus, object);
     }
 
   XD_DEBUG_MESSAGE ("%s", signature);
@@ -1480,7 +1480,7 @@ usage: (dbus-message-internal &rest REST)  */)
              bus or an unknown name, we regard it as broadcast message
              due to backward compatibility.  */
           if (dbus_bus_name_has_owner (connection, SSDATA (service), NULL))
-            uname = call2 (intern ("dbus-get-name-owner"), bus, service);
+            uname = call2 (Qdbus_get_name_owner, bus, service);
           else
             uname = Qnil;
 
@@ -1886,6 +1886,7 @@ syms_of_dbusbind (void)
         list2 (Qdbus_error, Qerror));
   Fput (Qdbus_error, Qerror_message,
         build_pure_c_string ("D-Bus error"));
+  DEFSYM (QD_Bus, "D-Bus");
 
   /* Lisp symbols of the system and session buses.  */
   DEFSYM (QCsystem, ":system");
@@ -1924,6 +1925,9 @@ syms_of_dbusbind (void)
   DEFSYM (QCsignal, ":signal");
   DEFSYM (QCmonitor, ":monitor");
 
+  /* Miscellaneous Lisp symbols.  */
+  DEFSYM (Qdbus_get_name_owner, "dbus-get-name-owner");
+
   DEFVAR_LISP ("dbus-compiled-version",
                Vdbus_compiled_version,
     doc: /* The version of D-Bus Emacs is compiled against.  */);