Rename comp-subr-safe-advice -> comp-subr-trampoline-install

diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 4df8743de501494de850eb62b3fb09c5bbbbfff9..fb67de3a029f39271e5bb119b6d74b326569497a 100644 (file)
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -2076,7 +2076,7 @@ If FUNCTION was not advised already, its advice info will be
 initialized.  Redefining a piece of advice whose name is part of
 the cache-id will clear the cache."
   (when (subr-primitive-p (symbol-function function))
-    (comp-subr-safe-advice function))
+    (comp-subr-trampoline-install function))
   (cond ((not (ad-is-advised function))
          (ad-initialize-advice-info function)
         (ad-set-advice-info-field

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index ef13c0ce63e745f85807ca6c5ff52e8c55265657..7074ff759e0d14b26679f85513c3891045cf6069 100644 (file)
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -2614,7 +2614,7 @@ Return the its filename if found or nil otherwise."
 `comp-eln-load-path'")))))
 
 ;;;###autoload
-(defun comp-subr-safe-advice (subr-name)
+(defun comp-subr-trampoline-install (subr-name)
   "Make SUBR-NAME effectively advice-able when called from native code."
   (unless (or (memq subr-name comp-never-optimize-functions)
               (gethash subr-name comp-installed-trampolines-h))

diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 5b3aa7085082fc2b3146d6b489a4fe080ac69f29..039613258569d3363f828b15d1157fda6e89de3e 100644 (file)
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -333,7 +333,7 @@ is also interactive.  There are 3 cases:
         ;; Must require explicitly as during bootstrap we have no
         ;; autoloads.
         (require 'comp)
-        (comp-subr-safe-advice subr-name))))
+        (comp-subr-trampoline-install subr-name))))
   (let* ((name (cdr (assq 'name props)))
          (a (advice--member-p (or name function) (if name t) (gv-deref ref))))
     (when a