From: Po Lu Date: Thu, 9 May 2024 07:02:06 +0000 (+0800) Subject: Intern additional symbols ahead-of-time X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c689376fdb21127cc2650c5580fcaa51fd7c184b;p=emacs.git Intern additional symbols ahead-of-time * src/gnutls.c (Fgnutls_available_p, syms_of_gnutls): * src/minibuf.c (Fread_buffer, syms_of_minibuf): Define and intern symbols overlooked in the previous change. (cherry picked from commit 58a7b99823c5c42161e9acf2abf6c22afd4da4cd) --- diff --git a/src/gnutls.c b/src/gnutls.c index efee2dccbb4..3ff7f21d5a5 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -2953,22 +2953,22 @@ Any GnuTLS extension with ID up to 100 return Qnil; # endif /* WINDOWSNT */ - capabilities = Fcons (intern("gnutls"), capabilities); + capabilities = Fcons (Qgnutls, capabilities); # ifdef HAVE_GNUTLS_EXT__DUMBFW - capabilities = Fcons (intern("ClientHello Padding"), capabilities); + capabilities = Fcons (QClientHello_Padding, capabilities); # endif # ifdef HAVE_GNUTLS3 - capabilities = Fcons (intern("gnutls3"), capabilities); - capabilities = Fcons (intern("digests"), capabilities); - capabilities = Fcons (intern("ciphers"), capabilities); + capabilities = Fcons (Qgnutls3, capabilities); + capabilities = Fcons (Qdigests, capabilities); + capabilities = Fcons (Qciphers, capabilities); # ifdef HAVE_GNUTLS_AEAD - capabilities = Fcons (intern("AEAD-ciphers"), capabilities); + capabilities = Fcons (QAEAD_ciphers, capabilities); # endif - capabilities = Fcons (intern("macs"), capabilities); + capabilities = Fcons (Qmacs, capabilities); # ifdef HAVE_GNUTLS_EXT_GET_NAME for (unsigned int ext=0; ext < 100; ext++) @@ -3120,6 +3120,7 @@ are as per the GnuTLS logging conventions. */); defsubr (&Sgnutls_available_p); + DEFSYM (QAEAD_ciphers, "AEAD-ciphers"); DEFSYM (QCcertificate, ":certificate"); DEFSYM (QCcertificate_id, ":certificate-id"); DEFSYM (QCcertificate_security_level, ":certificate-security-level"); @@ -3135,6 +3136,7 @@ are as per the GnuTLS logging conventions. */); DEFSYM (QCissuer, ":issuer"); DEFSYM (QCissuer_unique_id, ":issuer-unique-id"); DEFSYM (QCkey_exchange, ":key-exchange"); + DEFSYM (QClientHello_Padding, "ClientHello Padding"); DEFSYM (QCmac, ":mac"); DEFSYM (QCmissing_ocsp_status, ":missing-ocsp-status"); DEFSYM (QCno_host_match, ":no-host-match"); @@ -3163,4 +3165,9 @@ are as per the GnuTLS logging conventions. */); DEFSYM (QCvalid_to, ":valid-to"); DEFSYM (QCversion, ":version"); DEFSYM (QCwarnings, ":warnings"); + DEFSYM (Qciphers, "ciphers"); + DEFSYM (Qdigests, "digests"); + DEFSYM (Qgnutls, "gnutls"); + DEFSYM (Qgnutls3, "gnutls3"); + DEFSYM (Qmacs, "macs"); } diff --git a/src/minibuf.c b/src/minibuf.c index 83bcb919204..74588c20c23 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1518,7 +1518,7 @@ behavior. */) STRING_MULTIBYTE (prompt)); } - prompt = CALLN (Ffuncall, intern("format-prompt"), + prompt = CALLN (Ffuncall, Qformat_prompt, prompt, CONSP (def) ? XCAR (def) : def); } @@ -2396,4 +2396,5 @@ showing the *Completions* buffer, if any. */); DEFSYM (Qminibuffer_quit_recursive_edit, "minibuffer-quit-recursive-edit"); DEFSYM (Qinternal_complete_buffer, "internal-complete-buffer"); DEFSYM (Qcompleting_read_function, "completing-read-function"); + DEFSYM (Qformat_prompt, "format-prompt"); }