From fdb31d6a2709bff751c2ad240c41b30db1848b44 Mon Sep 17 00:00:00 2001
From: Andrea Corallo <akrl@sdf.org>
Date: Wed, 25 Dec 2019 23:04:13 +0100
Subject: [PATCH] fix naming for predicate SUBR_NATIVE_COMPILEDP

---
 src/alloc.c   | 4 ++--
 src/data.c    | 4 ++--
 src/doc.c     | 2 +-
 src/lisp.h    | 4 ++--
 src/pdumper.c | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/alloc.c b/src/alloc.c
index 6d6f6934bab..faa8e703937 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6564,7 +6564,7 @@ mark_object (Lisp_Object arg)
 	    break;
 
 	  case PVEC_SUBR:
-	    if (SUBRP_NATIVE_COMPILEDP (obj))
+	    if (SUBR_NATIVE_COMPILEDP (obj))
 	      {
 		set_vector_marked (ptr);
 		struct Lisp_Subr *subr = XSUBR (obj);
@@ -6715,7 +6715,7 @@ survives_gc_p (Lisp_Object obj)
 
     case Lisp_Vectorlike:
       survives_p =
-	(SUBRP (obj) && !SUBRP_NATIVE_COMPILEDP (obj)) ||
+	(SUBRP (obj) && !SUBR_NATIVE_COMPILEDP (obj)) ||
 	vector_marked_p (XVECTOR (obj));
       break;
 
diff --git a/src/data.c b/src/data.c
index d20db4dc3a3..191fb313687 100644
--- a/src/data.c
+++ b/src/data.c
@@ -872,7 +872,7 @@ DEFUN ("subr-native-elisp-p", Fsubr_native_elisp_p, Ssubr_native_elisp_p, 1, 1,
 nil otherwise.  */)
   (Lisp_Object object)
 {
-  return SUBRP_NATIVE_COMPILEDP (object) ? Qt : Qnil;
+  return SUBR_NATIVE_COMPILEDP (object) ? Qt : Qnil;
 }
 
 DEFUN ("subr-native-comp-unit", Fsubr_native_comp_unit,
@@ -919,7 +919,7 @@ Value, if non-nil, is a list (interactive SPEC).  */)
 
   if (SUBRP (fun))
     {
-      if (SUBRP_NATIVE_COMPILEDP (fun) && XSUBR (fun)->native_intspec)
+      if (SUBR_NATIVE_COMPILEDP (fun) && XSUBR (fun)->native_intspec)
 	return XSUBR (fun)->native_intspec;
 
       const char *spec = XSUBR (fun)->intspec;
diff --git a/src/doc.c b/src/doc.c
index 2c96fc15a7c..192e2011093 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -510,7 +510,7 @@ store_function_docstring (Lisp_Object obj, EMACS_INT offset)
 	    XSETCAR (tem, make_fixnum (offset));
 	}
     }
-  else if (SUBRP_NATIVE_COMPILEDP (fun))
+  else if (SUBR_NATIVE_COMPILEDP (fun))
     {
       XSUBR (fun)->native_doc = Qnil;
     }
diff --git a/src/lisp.h b/src/lisp.h
index a4cabc34855..69db8cdef10 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4759,7 +4759,7 @@ extern char *emacs_root_dir (void);
 
 #ifdef HAVE_NATIVE_COMP
 INLINE bool
-SUBRP_NATIVE_COMPILEDP (Lisp_Object a)
+SUBR_NATIVE_COMPILEDP (Lisp_Object a)
 {
   return SUBRP (a) && XSUBR (a)->native_comp_u[0];
 }
@@ -4772,7 +4772,7 @@ allocate_native_comp_unit (void)
 }
 #else
 INLINE bool
-SUBRP_NATIVE_COMPILEDP (Lisp_Object a)
+SUBR_NATIVE_COMPILEDP (Lisp_Object a)
 {
   return false;
 }
diff --git a/src/pdumper.c b/src/pdumper.c
index 422bec47a66..81d48496be2 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -956,7 +956,7 @@ dump_note_reachable (struct dump_context *ctx, Lisp_Object object)
 static void *
 dump_object_emacs_ptr (Lisp_Object lv)
 {
-  if (SUBRP (lv) && !SUBRP_NATIVE_COMPILEDP (lv))
+  if (SUBRP (lv) && !SUBR_NATIVE_COMPILEDP (lv))
     return XSUBR (lv);
   if (dump_builtin_symbol_p (lv))
     return XSYMBOL (lv);
@@ -3962,7 +3962,7 @@ dump_do_fixup (struct dump_context *ctx,
       /* Dump wants a pointer to a Lisp object.
          If DUMP_FIXUP_LISP_OBJECT_RAW, we should stick a C pointer in
          the dump; otherwise, a Lisp_Object.  */
-      if (SUBRP (arg) && !SUBRP_NATIVE_COMPILEDP(arg))
+      if (SUBRP (arg) && !SUBR_NATIVE_COMPILEDP (arg))
         {
           dump_value = emacs_offset (XSUBR (arg));
           if (type == DUMP_FIXUP_LISP_OBJECT)
-- 
2.39.5