some style fixes

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index e8a9b6c2b694ed2fd0e14781a5aaa24ce3d90c47..6b9965b82006837e2140e308d5051a49e7c5e9e1 100644 (file)
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -406,7 +406,7 @@ Put PREFIX in front of it."
   "Byte compile FUNCTION-NAME spilling data from the byte compiler."
   (let* ((f (symbol-function function-name))
          (func (make-comp-func :name function-name
-                               :c-name (comp-c-func-name function-name"F")
+                               :c-name (comp-c-func-name function-name "F")
                                :doc (documentation f)
                                :int-spec (interactive-form f))))
       (when (byte-code-function-p f)

diff --git a/src/comp.c b/src/comp.c
index 7e25bdc9256c800af707e5cc60114ea104aad9a2..87986abee68ad8d364e326b0495b737f393ece98 100644 (file)
--- a/src/comp.c
+++ b/src/comp.c
@@ -1824,7 +1824,7 @@ emit_ctxt_code (void)
       fields[n_frelocs++] = xmint_pointer (XCDR (el));
     }
 
-  Lisp_Object subr_l = Vsubr_list;
+  Lisp_Object subr_l = Vcomp_subr_list;
   FOR_EACH_TAIL (subr_l)
     {
       struct Lisp_Subr *subr = XSUBR (XCAR (subr_l));
@@ -3121,7 +3121,7 @@ fill_freloc (void)
   memcpy (freloc.link_table, helper_link_table, sizeof (helper_link_table));
   freloc.size = ARRAYELTS (helper_link_table);
 
-  Lisp_Object subr_l = Vsubr_list;
+  Lisp_Object subr_l = Vcomp_subr_list;
   FOR_EACH_TAIL (subr_l)
     {
       if (freloc.size == F_RELOC_MAX_SIZE)
@@ -3290,7 +3290,7 @@ DEFUN ("comp--register-subr", Fcomp__register_subr, Scomp__register_subr,
   XSETSUBR (tem, &x->s);
   set_symbol_function (name, tem);
 
-  Fputhash (name, c_name, Vsym_subr_c_name_h);
+  Fputhash (name, c_name, Vcomp_sym_subr_c_name_h);
   LOADHIST_ATTACH (Fcons (Qdefun, name));
 
   return Qnil;
@@ -3431,12 +3431,12 @@ syms_of_comp (void)
   Vcomp_ctxt = Qnil;
 
   /* FIXME should be initialized but not here... */
-  DEFVAR_LISP ("comp-subr-list", Vsubr_list,
+  DEFVAR_LISP ("comp-subr-list", Vcomp_subr_list,
               doc: /* List of all defined subrs.  */);
-  DEFVAR_LISP ("comp-sym-subr-c-name-h", Vsym_subr_c_name_h,
+  DEFVAR_LISP ("comp-sym-subr-c-name-h", Vcomp_sym_subr_c_name_h,
               doc: /* Hash table symbol-function -> function-c-name.  For
                       internal use during  */);
-  Vsym_subr_c_name_h = CALLN (Fmake_hash_table);
+  Vcomp_sym_subr_c_name_h = CALLN (Fmake_hash_table);
 }
 
 #endif /* HAVE_NATIVE_COMP */

diff --git a/src/lread.c b/src/lread.c
index 1ba04835aa1a5d2a35e0e3ac31c8dd1278bc83d5..4e8a3adeb9438d32392ca7c862bceab02f866300 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -4466,7 +4466,7 @@ defsubr (union Aligned_Lisp_Subr *aname)
   XSETSUBR (tem, sname);
   set_symbol_function (sym, tem);
 #ifdef HAVE_NATIVE_COMP
-  Vsubr_list = Fcons (tem, Vsubr_list);
+  Vcomp_subr_list = Fcons (tem, Vcomp_subr_list);
 #endif /* HAVE_NATIVE_COMP */
 }
 

diff --git a/src/pdumper.c b/src/pdumper.c
index 5bfccb8ac90a3e32dfac50392feff4dc2e507822..610b94b0a32267db6d08be71545b7cc433c72b89 100644 (file)
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -5323,7 +5323,7 @@ dump_do_dump_relocation (const uintptr_t dump_base,
          XNATIVE_COMP_UNIT (subr->native_comp_u);
        if (!comp_u->handle)
          error ("can't relocate native subr with not loaded compilation unit");
-       Lisp_Object c_name = Fgethash (name, Vsym_subr_c_name_h, Qnil);
+       Lisp_Object c_name = Fgethash (name, Vcomp_sym_subr_c_name_h, Qnil);
        if (NILP (c_name))
          error ("missing label name");
        void *func = dynlib_sym (comp_u->handle, SSDATA (c_name));