From e66106378d954902ab34d190b5c7e6f49323a3c1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gerd=20M=C3=B6llmann?= <gerd@gnu.org>
Date: Sat, 31 Dec 2022 09:24:47 +0100
Subject: [PATCH] Symbol-name, intern* with additional arg

---
 src/callint.c  |  6 +++---
 src/coding.c   | 16 ++++++++--------
 src/data.c     |  6 +++---
 src/eval.c     |  2 +-
 src/fns.c      |  4 ++--
 src/font.c     | 12 ++++++------
 src/frame.c    |  4 ++--
 src/json.c     |  2 +-
 src/keyboard.c |  4 ++--
 src/keymap.c   | 12 ++++++------
 src/lisp.h     |  6 +++---
 src/lread.c    | 16 ++++++++--------
 src/minibuf.c  | 14 +++++++-------
 src/pkg.c      |  4 ++--
 src/print.c    |  4 ++--
 src/process.c  |  2 +-
 src/term.c     |  2 +-
 src/treesit.c  |  4 ++--
 src/xdisp.c    |  2 +-
 src/xfaces.c   |  4 ++--
 20 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/src/callint.c b/src/callint.c
index 8ef0e5240a5..be6fa99d423 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -460,7 +460,7 @@ invoke it (via an `interactive' spec that contains, for instance, an
 	  visargs[i] = Fcompleting_read (callint_message,
 					 Vobarray, Qfboundp, Qt,
 					 Qnil, Qnil, Qnil, Qnil);
-	  args[i] = Fintern (visargs[i], Qnil);
+	  args[i] = Fintern (visargs[i], Qnil, Qnil);
 	  break;
 
 	case 'b':   		/* Name of existing buffer.  */
@@ -494,7 +494,7 @@ invoke it (via an `interactive' spec that contains, for instance, an
 	  visargs[i] = Fcompleting_read (callint_message,
 					 Vobarray, Qcommandp,
 					 Qt, Qnil, Qnil, Qnil, Qnil);
-	  args[i] = Fintern (visargs[i], Qnil);
+	  args[i] = Fintern (visargs[i], Qnil, Qnil);
 	  break;
 
 	case 'd':		/* Value of point.  Does not do I/O.  */
@@ -673,7 +673,7 @@ invoke it (via an `interactive' spec that contains, for instance, an
 	case 'S':		/* Any symbol.  */
 	  visargs[i] = Fread_string (callint_message,
 				     Qnil, Qnil, Qnil, Qnil);
-	  args[i] = Fintern (visargs[i], Qnil);
+	  args[i] = Fintern (visargs[i], Qnil, Qnil);
 	  break;
 
 	case 'v':		/* Variable name: symbol that is
diff --git a/src/coding.c b/src/coding.c
index ab73bda8440..e8823339004 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -8562,7 +8562,7 @@ DEFUN ("read-non-nil-coding-system", Fread_non_nil_coding_system,
 			      Qt, Qnil, Qcoding_system_history, Qnil, Qnil);
     }
   while (SCHARS (val) == 0);
-  return (Fintern (val, Qnil));
+  return Fintern (val, Qnil, Qnil);
 }
 
 DEFUN ("read-coding-system", Fread_coding_system, Sread_coding_system, 1, 2, 0,
@@ -8582,7 +8582,7 @@ are lower-case).  */)
 			  Qt, Qnil, Qcoding_system_history,
 			  default_coding_system, Qnil);
   val = unbind_to (count, val);
-  return (SCHARS (val) == 0 ? Qnil : Fintern (val, Qnil));
+  return (SCHARS (val) == 0 ? Qnil : Fintern (val, Qnil, Qnil));
 }
 
 DEFUN ("check-coding-system", Fcheck_coding_system, Scheck_coding_system,
@@ -11412,10 +11412,10 @@ usage: (define-coding-system-internal ...)  */)
 	  ASET (this_spec, 2, this_eol_type);
 	  Fputhash (this_name, this_spec, Vcoding_system_hash_table);
 	  Vcoding_system_list = Fcons (this_name, Vcoding_system_list);
-	  val = Fassoc (Fsymbol_name (this_name), Vcoding_system_alist, Qnil);
+	  val = Fassoc (Fsymbol_name (this_name, Qnil), Vcoding_system_alist, Qnil);
 	  if (NILP (val))
 	    Vcoding_system_alist
-	      = Fcons (Fcons (Fsymbol_name (this_name), Qnil),
+	      = Fcons (Fcons (Fsymbol_name (this_name, Qnil), Qnil),
 		       Vcoding_system_alist);
 	}
     }
@@ -11427,9 +11427,9 @@ usage: (define-coding-system-internal ...)  */)
 
   Fputhash (name, spec_vec, Vcoding_system_hash_table);
   Vcoding_system_list = Fcons (name, Vcoding_system_list);
-  val = Fassoc (Fsymbol_name (name), Vcoding_system_alist, Qnil);
+  val = Fassoc (Fsymbol_name (name, Qnil), Vcoding_system_alist, Qnil);
   if (NILP (val))
-    Vcoding_system_alist = Fcons (Fcons (Fsymbol_name (name), Qnil),
+    Vcoding_system_alist = Fcons (Fcons (Fsymbol_name (name, Qnil), Qnil),
 				  Vcoding_system_alist);
 
   int id = coding_categories[category].id;
@@ -11535,9 +11535,9 @@ DEFUN ("define-coding-system-alias", Fdefine_coding_system_alias,
 
   Fputhash (alias, spec, Vcoding_system_hash_table);
   Vcoding_system_list = Fcons (alias, Vcoding_system_list);
-  val = Fassoc (Fsymbol_name (alias), Vcoding_system_alist, Qnil);
+  val = Fassoc (Fsymbol_name (alias, Qnil), Vcoding_system_alist, Qnil);
   if (NILP (val))
-    Vcoding_system_alist = Fcons (Fcons (Fsymbol_name (alias), Qnil),
+    Vcoding_system_alist = Fcons (Fcons (Fsymbol_name (alias, Qnil), Qnil),
 				  Vcoding_system_alist);
 
   return Qnil;
diff --git a/src/data.c b/src/data.c
index e6be07179be..15c8ebf7ea6 100644
--- a/src/data.c
+++ b/src/data.c
@@ -769,12 +769,12 @@ DEFUN ("symbol-plist", Fsymbol_plist, Ssymbol_plist, 1, 1, 0,
   return XSYMBOL (symbol)->u.s.plist;
 }
 
-DEFUN ("symbol-name", Fsymbol_name, Ssymbol_name, 1, 1, 0,
+DEFUN ("symbol-name", Fsymbol_name, Ssymbol_name, 1, 2, 0,
        doc: /* Return SYMBOL's name, a string.  */)
-  (register Lisp_Object symbol)
+  (const Lisp_Object symbol, const Lisp_Object cl)
 {
   CHECK_SYMBOL (symbol);
-  if (SYMBOL_KEYWORD_P (symbol))
+  if (SYMBOL_KEYWORD_P (symbol) && NILP (cl))
     return concat2 (build_string (":"), SYMBOL_NAME (symbol));
   return SYMBOL_NAME (symbol);
 }
diff --git a/src/eval.c b/src/eval.c
index cff4b924778..b212cdd73ad 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -546,7 +546,7 @@ usage: (function ARG)  */)
 	  if (SYMBOLP (docstring) && !NILP (docstring))
 	    /* Hack for OClosures: Allow the docstring to be a symbol
              * (the OClosure's type).  */
-	    docstring = Fsymbol_name (docstring);
+	    docstring = Fsymbol_name (docstring, Qnil);
 	  CHECK_STRING (docstring);
 	  cdr = Fcons (XCAR (cdr), Fcons (docstring, XCDR (XCDR (cdr))));
 	}
diff --git a/src/fns.c b/src/fns.c
index 63e5fd56f01..f3743e2f5a5 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3407,7 +3407,7 @@ FILENAME are suppressed.  */)
 
       /* Load the file.  */
       tem = load_with_autoload_queue
-	(NILP (filename) ? Fsymbol_name (feature) : filename,
+	(NILP (filename) ? Fsymbol_name (feature, Qnil) : filename,
 	 noerror, Qt, Qnil, (NILP (filename) ? Qt : Qnil));
 
       /* If load failed entirely, return nil.  */
@@ -5814,7 +5814,7 @@ secure_hash (Lisp_Object algorithm, Lisp_Object object, Lisp_Object start,
       hash_func	  = sha512_buffer;
     }
   else
-    error ("Invalid algorithm arg: %s", SDATA (Fsymbol_name (algorithm)));
+    error ("Invalid algorithm arg: %s", SDATA (Fsymbol_name (algorithm, Qnil)));
 
   /* allocate 2 x digest_size so that it can be re-used to hold the
      hexified value */
diff --git a/src/font.c b/src/font.c
index 0d03eeafe89..c9e3dc737e2 100644
--- a/src/font.c
+++ b/src/font.c
@@ -532,11 +532,11 @@ static Lisp_Object
 font_prop_validate_symbol (Lisp_Object prop, Lisp_Object val)
 {
   if (STRINGP (val))
-    val = Fintern (val, Qnil);
+    val = Fintern (val, Qnil, Qnil);
   if (! SYMBOLP (val))
     val = Qerror;
   else if (EQ (prop, QCregistry))
-    val = Fintern (Fdowncase (SYMBOL_NAME (val)), Qnil);
+    val = Fintern (Fdowncase (SYMBOL_NAME (val)), Qnil, Qnil);
   return val;
 }
 
@@ -1009,7 +1009,7 @@ font_expand_wildcards (Lisp_Object *field, int n)
   memclear (field + j, (XLFD_LAST_INDEX - j) * word_size);
   if (FIXNUMP (field[XLFD_ENCODING_INDEX]))
     field[XLFD_ENCODING_INDEX]
-      = Fintern (Fnumber_to_string (field[XLFD_ENCODING_INDEX]), Qnil);
+      = Fintern (Fnumber_to_string (field[XLFD_ENCODING_INDEX]), Qnil, Qnil);
   return 0;
 }
 
@@ -1197,7 +1197,7 @@ font_parse_xlfd_1 (char *name, ptrdiff_t len, Lisp_Object font, int segments)
 			 SYMBOL_NAME (prop[XLFD_ENCODING_INDEX]));
 	}
       if (! NILP (val))
-	ASET (font, FONT_REGISTRY_INDEX, Fintern (val, Qnil));
+	ASET (font, FONT_REGISTRY_INDEX, Fintern (val, Qnil, Qnil));
 
       if (FIXNUMP (prop[XLFD_PIXEL_INDEX]))
 	ASET (font, FONT_SIZE_INDEX, prop[XLFD_PIXEL_INDEX]);
@@ -1811,7 +1811,7 @@ font_parse_family_registry (Lisp_Object family, Lisp_Object registry, Lisp_Objec
 	  Ffont_put (font_spec, QCfamily, font_intern_prop (p1, len, 1));
 	}
       else
-	ASET (font_spec, FONT_FAMILY_INDEX, Fintern (family, Qnil));
+	ASET (font_spec, FONT_FAMILY_INDEX, Fintern (family, Qnil, Qnil));
     }
   if (! NILP (registry))
     {
@@ -1827,7 +1827,7 @@ font_parse_family_registry (Lisp_Object family, Lisp_Object registry, Lisp_Objec
 	  registry = concat2 (registry, extra);
 	}
       registry = Fdowncase (registry);
-      ASET (font_spec, FONT_REGISTRY_INDEX, Fintern (registry, Qnil));
+      ASET (font_spec, FONT_REGISTRY_INDEX, Fintern (registry, Qnil, Qnil));
     }
 }
 
diff --git a/src/frame.c b/src/frame.c
index 7d902dabd4f..3b1c6404c59 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4776,7 +4776,7 @@ gui_set_font_backend (struct frame *f, Lisp_Object new_value, Lisp_Object old_va
 	{
 	  while (*p1 && ! c_isspace (*p1) && *p1 != ',') p1++;
 	  if (p0 < p1)
-	    new_value = Fcons (Fintern (make_string (p0, p1 - p0), Qnil),
+	    new_value = Fcons (Fintern (make_string (p0, p1 - p0), Qnil, Qt),
 			       new_value);
 	  if (*p1)
 	    {
@@ -5461,7 +5461,7 @@ gui_display_get_arg (Display_Info *dpyinfo, Lisp_Object alist, Lisp_Object param
 		      || !strcmp (SSDATA (lower), "false"))
 		  return Qnil;
 		else
-		  return Fintern (tem, Qnil);
+		  return Fintern (tem, Qnil, Qnil);
 	      }
 
 	    default:
diff --git a/src/json.c b/src/json.c
index 621c7d7c15f..41477701176 100644
--- a/src/json.c
+++ b/src/json.c
@@ -896,7 +896,7 @@ json_to_lisp (json_t *json, const struct json_configuration *conf)
               json_object_foreach (json, key_str, value)
                 {
                   Lisp_Object key
-		    = Fintern (build_string_from_utf8 (key_str), Qnil);
+		    = Fintern (build_string_from_utf8 (key_str), Qnil, Qnil);
                   result
                     = Fcons (Fcons (key, json_to_lisp (value, conf)),
                              result);
diff --git a/src/keyboard.c b/src/keyboard.c
index 7bf89ac7d4b..42b6e7db625 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6832,7 +6832,7 @@ apply_modifiers_uncached (int modifiers, char *base, int base_len, int base_len_
     memcpy (SDATA (new_name), new_mods, mod_len);
     memcpy (SDATA (new_name) + mod_len, base, base_len_byte);
 
-    return Fintern (new_name, Qnil);
+    return Fintern (new_name, Qnil, Qnil);
   }
 }
 
@@ -6895,7 +6895,7 @@ parse_modifiers (Lisp_Object symbol)
 
       unmodified = Fintern (make_string (SSDATA (SYMBOL_NAME (symbol)) + end,
 					 SBYTES (SYMBOL_NAME (symbol)) - end),
-			    Qnil);
+			    Qnil, Qnil);
 
       if (modifiers & ~INTMASK)
 	emacs_abort ();
diff --git a/src/keymap.c b/src/keymap.c
index 506b755e5da..a52b35799c4 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1354,7 +1354,7 @@ recognize the default bindings, just as `read-key-sequence' does.  */)
 	    ASET (new_key, i, item);
 	  else
 	    {
-	      Lisp_Object key_item = Fsymbol_name (item);
+	      Lisp_Object key_item = Fsymbol_name (item, Qnil);
 	      Lisp_Object new_item;
 	      if (!STRING_MULTIBYTE (key_item))
 		new_item = Fdowncase (key_item);
@@ -1385,7 +1385,7 @@ recognize the default bindings, just as `read-key-sequence' does.  */)
 						    SBYTES (key_item));
 		  SAFE_FREE ();
 		}
-	      ASET (new_key, i, Fintern (new_item, Qnil));
+	      ASET (new_key, i, Fintern (new_item, Qnil, Qnil));
 	    }
 	}
 
@@ -1402,7 +1402,7 @@ recognize the default bindings, just as `read-key-sequence' does.  */)
 	  if (!SYMBOLP (AREF (new_key, i)))
 	    continue;
 
-	  Lisp_Object lc_key = Fsymbol_name (AREF (new_key, i));
+	  Lisp_Object lc_key = Fsymbol_name (AREF (new_key, i), Qnil);
 
 	  /* If there are no spaces in this symbol, just skip it.  */
 	  if (!strstr (SSDATA (lc_key), " "))
@@ -1427,7 +1427,7 @@ recognize the default bindings, just as `read-key-sequence' does.  */)
 	  Lisp_Object new_it =
 	    make_multibyte_string ((char *) dst,
 				   SCHARS (lc_key), SBYTES (lc_key));
-	  ASET (new_key, i, Fintern (new_it, Qnil));
+	  ASET (new_key, i, Fintern (new_it, Qnil, Qnil));
 	  SAFE_FREE ();
 	}
 
@@ -1471,7 +1471,7 @@ silly_event_symbol_error (Lisp_Object c)
   Lisp_Object parsed = parse_modifiers (c);
   int modifiers = XFIXNAT (XCAR (XCDR (parsed)));
   Lisp_Object base = XCAR (parsed);
-  Lisp_Object name = Fsymbol_name (base);
+  Lisp_Object name = Fsymbol_name (base, Qnil);
   /* This alist includes elements such as ("RET" . "\\r").  */
   Lisp_Object assoc = Fassoc (name, exclude_keys, Qnil);
 
@@ -2349,7 +2349,7 @@ See `text-char-description' for describing character codes.  */)
 	  return result;
 	}
       else
-	return Fsymbol_name (key);
+	return Fsymbol_name (key, Qnil);
     }
   else if (STRINGP (key))	/* Buffer names in the menubar.  */
     return Fcopy_sequence (key);
diff --git a/src/lisp.h b/src/lisp.h
index 3fadd228d2d..80009d08872 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2289,8 +2289,8 @@ extern Lisp_Object pkg_unqualified_symbol (Lisp_Object name);
 extern bool pkg_keywordp (Lisp_Object obj);
 extern Lisp_Object pkg_define_symbol (Lisp_Object sym, Lisp_Object package);
 extern Lisp_Object pkg_intern_symbol (Lisp_Object sym, Lisp_Object package, Lisp_Object *status);
-extern Lisp_Object pkg_emacs_intern (Lisp_Object name, Lisp_Object package);
-extern Lisp_Object pkg_emacs_intern_soft (Lisp_Object name, Lisp_Object package);
+extern Lisp_Object pkg_emacs_intern (Lisp_Object name, Lisp_Object package, Lisp_Object cl);
+extern Lisp_Object pkg_emacs_intern_soft (Lisp_Object name, Lisp_Object package, Lisp_Object cl);
 extern Lisp_Object pkg_emacs_unintern (Lisp_Object name, Lisp_Object package);
 extern Lisp_Object pkg_emacs_mapatoms (Lisp_Object fn, Lisp_Object package);
 extern Lisp_Object pkg_lookup_non_keyword_c_string (const char *ptr, ptrdiff_t nchars, ptrdiff_t nbytes);
@@ -2443,7 +2443,7 @@ INLINE Lisp_Object
 LISP_SYMBOL_NAME (Lisp_Object sym)
 {
   if (SYMBOL_KEYWORD_P (sym))
-    return Fsymbol_name (sym);
+    return Fsymbol_name (sym, Qnil);
   return SYMBOL_NAME (sym);
 }
 
diff --git a/src/lread.c b/src/lread.c
index b28987551ee..7cf3b22aeea 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3863,7 +3863,7 @@ read0 (Lisp_Object readcharfun, bool locate_syms)
 
 	  case '#':
 	    /* ## -- the empty symbol */
-	    obj = Fintern (empty_unibyte_string, Qnil);
+	    obj = Fintern (empty_unibyte_string, Qnil, Qnil);
 	    break;
 
 	  case 's':
@@ -4011,7 +4011,7 @@ read0 (Lisp_Object readcharfun, bool locate_syms)
 	      {
 		/* No symbol character follows: this is the empty symbol.  */
 		UNREAD (c);
-		obj = Fintern (empty_unibyte_string, Qnil);
+		obj = Fintern (empty_unibyte_string, Qnil, Qnil);
 		break;
 	      }
 	    uninterned_symbol = false;
@@ -4788,25 +4788,25 @@ pkg_define_builtin_symbols (void)
     define_symbol (builtin_lisp_symbol (i), defsym_name[i]);
 }
 
-DEFUN ("intern", Fintern, Sintern, 1, 2, 0,
+DEFUN ("intern", Fintern, Sintern, 1, 3, 0,
        doc: /* Return the canonical symbol whose name is STRING.
 If there is none, one is created by this function and returned.
 A second optional argument specifies the obarray to use;
 it defaults to the value of `obarray'.  */)
-  (Lisp_Object string, Lisp_Object package)
+  (Lisp_Object string, Lisp_Object package, Lisp_Object cl)
 {
-  return pkg_emacs_intern (string, package);
+  return pkg_emacs_intern (string, package, cl);
 }
 
-DEFUN ("intern-soft", Fintern_soft, Sintern_soft, 1, 2, 0,
+DEFUN ("intern-soft", Fintern_soft, Sintern_soft, 1, 3, 0,
        doc: /* Return the canonical symbol named NAME, or nil if none exists.
 NAME may be a string or a symbol.  If it is a symbol, that exact
 symbol is searched for.
 A second optional argument specifies the obarray to use;
 it defaults to the value of `obarray'.  */)
-  (Lisp_Object name, Lisp_Object obarray)
+  (Lisp_Object name, Lisp_Object obarray, Lisp_Object cl)
 {
-  return pkg_emacs_intern_soft (name, obarray);
+  return pkg_emacs_intern_soft (name, obarray, cl);
 }
 
 DEFUN ("unintern", Funintern, Sunintern, 1, 2, 0,
diff --git a/src/minibuf.c b/src/minibuf.c
index 3a29c579a27..48fcbf20314 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1434,7 +1434,7 @@ null input, return a symbol whose name is an empty string.  */)
 			   Qnil, Qnil, default_string, Qnil);
   if (NILP (name))
     return name;
-  return Fintern (name, Qnil);
+  return Fintern (name, Qnil, Qnil);
 }
 
 #ifdef NOTDEF
@@ -1471,7 +1471,7 @@ A user option, or customizable variable, is one for which
 			   default_string, Qnil);
   if (NILP (name))
     return name;
-  return Fintern (name, Qnil);
+  return Fintern (name, Qnil, Qnil);
 }
 
 DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 4, 0,
@@ -1685,7 +1685,7 @@ or from one of the possible completions.  */)
       /* Is this element a possible completion?  */
 
       if (SYMBOLP (eltstring))
-	eltstring = Fsymbol_name (eltstring);
+	eltstring = Fsymbol_name (eltstring, Qnil);
 
       if (STRINGP (eltstring)
 	  && SCHARS (string) <= SCHARS (eltstring)
@@ -1924,7 +1924,7 @@ with a space are ignored unless STRING itself starts with a space.  */)
       /* Is this element a possible completion?  */
 
       if (SYMBOLP (eltstring))
-	eltstring = Fsymbol_name (eltstring);
+	eltstring = Fsymbol_name (eltstring, Qnil);
 
       if (STRINGP (eltstring)
 	  && SCHARS (string) <= SCHARS (eltstring)
@@ -2093,7 +2093,7 @@ the values STRING, PREDICATE and `lambda'.  */)
           {
             tem = HASH_KEY (h, i);
             if (BASE_EQ (tem, Qunbound)) continue;
-            Lisp_Object strkey = (SYMBOLP (tem) ? Fsymbol_name (tem) : tem);
+            Lisp_Object strkey = (SYMBOLP (tem) ? Fsymbol_name (tem, Qnil) : tem);
             if (!STRINGP (strkey)) continue;
             if (BASE_EQ (Fcompare_strings (string, Qnil, Qnil,
 					   strkey, Qnil, Qnil,
@@ -2193,7 +2193,7 @@ single string, rather than a cons cell whose car is a string.  */)
   register Lisp_Object tail;
 
   if (SYMBOLP (key))
-    key = Fsymbol_name (key);
+    key = Fsymbol_name (key, Qnil);
 
   for (tail = list; CONSP (tail); tail = XCDR (tail))
     {
@@ -2201,7 +2201,7 @@ single string, rather than a cons cell whose car is a string.  */)
       elt = XCAR (tail);
       thiscar = CONSP (elt) ? XCAR (elt) : elt;
       if (SYMBOLP (thiscar))
-	thiscar = Fsymbol_name (thiscar);
+	thiscar = Fsymbol_name (thiscar, Qnil);
       else if (!STRINGP (thiscar))
 	continue;
       tem = Fcompare_strings (thiscar, make_fixnum (0), Qnil,
diff --git a/src/pkg.c b/src/pkg.c
index 7f78c61cf32..52d05a69e26 100644
--- a/src/pkg.c
+++ b/src/pkg.c
@@ -521,7 +521,7 @@ pkg_fake_me_an_obarray (Lisp_Object vector)
 /* Implements Emacs' traditional Fintern function.  */
 
 Lisp_Object
-pkg_emacs_intern (Lisp_Object name, Lisp_Object package)
+pkg_emacs_intern (Lisp_Object name, Lisp_Object package, Lisp_Object cl)
 {
   CHECK_STRING (name);
 
@@ -547,7 +547,7 @@ pkg_emacs_intern (Lisp_Object name, Lisp_Object package)
 /* Implements Emacs' traditional Fintern_soft function.  */
 
 Lisp_Object
-pkg_emacs_intern_soft (Lisp_Object name, Lisp_Object package)
+pkg_emacs_intern_soft (Lisp_Object name, Lisp_Object package, Lisp_Object cl)
 {
   /* intern-soft allows symbols.  */
   Lisp_Object orig = name;
diff --git a/src/print.c b/src/print.c
index e25c88e2511..cc84b8443e3 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1904,7 +1904,7 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag,
 	    /* A frame could be too young and have no name yet;
 	       don't crash.  */
 	    if (SYMBOLP (frame_name))
-	      frame_name = Fsymbol_name (frame_name);
+	      frame_name = Fsymbol_name (frame_name, Qnil);
 	    else	/* can't happen: name should be either nil or string */
 	      frame_name = build_string ("*INVALID*FRAME*NAME*");
 	  }
@@ -2029,7 +2029,7 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag,
       Lisp_Object language = XTS_PARSER (obj)->language_symbol;
       /* No need to print the buffer because it's not that useful: we
 	 usually know which buffer a parser belongs to.  */
-      print_string (Fsymbol_name (language), printcharfun);
+      print_string (Fsymbol_name (language, Qnil), printcharfun);
       printchar ('>', printcharfun);
       break;
     case PVEC_TS_NODE:
diff --git a/src/process.c b/src/process.c
index e07a019b464..fec8b9c53fd 100644
--- a/src/process.c
+++ b/src/process.c
@@ -821,7 +821,7 @@ status_message (struct Lisp_Process *p)
       return CALLN (Fformat, format, code);
     }
   else
-    return Fcopy_sequence (Fsymbol_name (symbol));
+    return Fcopy_sequence (Fsymbol_name (symbol, Qnil));
 }
 
 enum { PTY_NAME_SIZE = 24 };
diff --git a/src/term.c b/src/term.c
index f8104e0304e..711740d45ea 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2160,7 +2160,7 @@ set_tty_color_mode (struct tty_display_info *tty, struct frame *f)
   Lisp_Object color_mode;
   int mode;
   Lisp_Object tty_color_mode_alist
-    = Fintern_soft (build_string ("tty-color-mode-alist"), Qnil);
+    = Fintern_soft (build_string ("tty-color-mode-alist"), Qnil, Qnil);
 
   tem = assq_no_quit (Qtty_color_mode, f->param_alist);
   val = CONSP (tem) ? XCDR (tem) : Qnil;
diff --git a/src/treesit.c b/src/treesit.c
index d168ff02b69..67b0f4b1810 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -528,7 +528,7 @@ static TSLanguage *
 treesit_load_language (Lisp_Object language_symbol,
 		       Lisp_Object *signal_symbol, Lisp_Object *signal_data)
 {
-  Lisp_Object symbol_name = Fsymbol_name (language_symbol);
+  Lisp_Object symbol_name = Fsymbol_name (language_symbol, Qnil);
 
   CHECK_LIST (Vtreesit_extra_load_path);
 
@@ -2408,7 +2408,7 @@ treesit_predicate_pred (Lisp_Object args, struct capture_range captures)
 				   "but was only given"),
 	      Flength (args));
 
-  Lisp_Object fn = Fintern (XCAR (args), Qnil);
+  Lisp_Object fn = Fintern (XCAR (args), Qnil, Qnil);
   Lisp_Object nodes = Qnil;
   Lisp_Object tail = XCDR (args);
   FOR_EACH_TAIL (tail)
diff --git a/src/xdisp.c b/src/xdisp.c
index db6dd3fab63..525279de9f1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -28201,7 +28201,7 @@ decode_mode_spec (struct window *w, register int c, int field_width,
       if (NILP (obj))
 	return "no process";
 #ifndef MSDOS
-      obj = Fsymbol_name (Fprocess_status (obj));
+      obj = Fsymbol_name (Fprocess_status (obj), Qnil);
 #endif
       break;
 
diff --git a/src/xfaces.c b/src/xfaces.c
index 823c1d93d07..99ce2b869ee 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1944,7 +1944,7 @@ resolve_face_name (Lisp_Object face_name, bool signal_p)
   Lisp_Object tortoise, hare;
 
   if (STRINGP (face_name))
-    face_name = Fintern (face_name, Qnil);
+    face_name = Fintern (face_name, Qnil, Qnil);
 
   if (NILP (face_name) || !SYMBOLP (face_name))
     return face_name;
@@ -5656,7 +5656,7 @@ be found.  Value is ALIST.  */)
       entry = Fcopy_sequence (entry);
       XSETCAR (tail, entry);
       for (tail2 = entry; CONSP (tail2); tail2 = XCDR (tail2))
-	XSETCAR (tail2, Fintern (XCAR (tail2), Qnil));
+	XSETCAR (tail2, Fintern (XCAR (tail2), Qnil, Qnil));
     }
 
   Vface_alternative_font_family_alist = alist;
-- 
2.39.2