diff options
| author | Philip Kaludercic <philipk@posteo.net> | 2022-08-18 09:23:45 +0200 |
|---|---|---|
| committer | Philip Kaludercic <philipk@posteo.net> | 2022-08-18 09:23:45 +0200 |
| commit | d3f03666bbd6c506d65650c33413df826f502065 (patch) | |
| tree | 52c932f10280cc9a63a4cebb2a673b5e49a5a0d2 /lisp/emacs-lisp/advice.el | |
| parent | 57e16b316d76b77de4252b7923eab8199b8c3fd5 (diff) | |
| parent | 9f26a8d31b1c7e6a596ca0933f327df5ac60463d (diff) | |
| download | emacs-d3f03666bbd6c506d65650c33413df826f502065.tar.gz emacs-d3f03666bbd6c506d65650c33413df826f502065.tar.bz2 emacs-d3f03666bbd6c506d65650c33413df826f502065.zip | |
Merge remote-tracking branch 'origin/master' into feature/package+vc
Diffstat (limited to 'lisp/emacs-lisp/advice.el')
| -rw-r--r-- | lisp/emacs-lisp/advice.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index 391743d7156..d383650f4e5 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -1054,9 +1054,9 @@ ;; (print "Let's clean up now!")) ;; foo ;; -;; Now `foo's advice is byte-compiled: +;; Now `foo's advice is compiled: ;; -;; (byte-code-function-p 'ad-Advice-foo) +;; (compiled-function-p 'ad-Advice-foo) ;; t ;; ;; (foo 3) @@ -1298,7 +1298,7 @@ ;; constructed during preactivation was used, even though we did not specify ;; the `compile' flag: ;; -;; (byte-code-function-p 'ad-Advice-fum) +;; (compiled-function-p 'ad-Advice-fum) ;; t ;; ;; (fum 2) @@ -1329,7 +1329,7 @@ ;; ;; A new uncompiled advised definition got constructed: ;; -;; (byte-code-function-p 'ad-Advice-fum) +;; (compiled-function-p 'ad-Advice-fum) ;; nil ;; ;; (fum 2) @@ -2116,9 +2116,9 @@ the cache-id will clear the cache." (defsubst ad-compiled-p (definition) "Return non-nil if DEFINITION is a compiled byte-code object." - (or (byte-code-function-p definition) - (and (macrop definition) - (byte-code-function-p (ad-lambdafy definition))))) + (or (compiled-function-p definition) + (and (macrop definition) + (compiled-function-p (ad-lambdafy definition))))) (defsubst ad-compiled-code (compiled-definition) "Return the byte-code object of a COMPILED-DEFINITION." |