mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-22 07:51:17 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/emacs-lisp/nadvice.el (advice--make-1): Fix autoloading avoidance.

Browse source 
(advice-add): Add a :advice--pending marker, so advice--make-1 knows
when the advice is pending.
(advice-remove): Remove this marker when not needed any more.
This commit is contained in:
Stefan Monnier 2014-03-10 21:22:24 -04:00
parent 4538c058d0
commit 1ea2256000
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2014-03-11 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/nadvice.el (advice--make-1): Fix autoloading avoidance.
(advice-add): Add a :advice--pending marker, so advice--make-1 knows
when the advice is pending.
(advice-remove): Remove this marker when not needed any more.
2014-03-11 Juanma Barranquero <lekktu@gmail.com>
* frameset.el: Separate options for reusing frames and cleaning up.

13
lisp/emacs-lisp/nadvice.el
View file

@ -141,11 +141,12 @@ Each element has the form (WHERE BYTECODE STACK) where:
(let ((adv-sig (gethash main advertised-signature-table))
(advice
(apply #'make-byte-code 128 byte-code
(vector #'apply function main props) stack-depth
nil
(vector #'apply function main props) stack-depth nil
(and (or (commandp function) (commandp main))
(not (and (symbolp main) ;; Don't autoload too eagerly!
(autoloadp (symbol-function main))))
;; If we're adding the advice on advice--pending, don't
;; build an interactive-form, which won't be used anyway
;; and would risk autoloading `main' (or `function').
(not (eq main :advice--pending))
(list (advice--make-interactive-form
function main))))))
(when adv-sig (puthash advice adv-sig advertised-signature-table))
@ -392,6 +393,8 @@ is defined as a macro, alias, command, ..."
;; - `autoload' does nothing if the function is
;; not an autoload or undefined.
((or (not nf) (autoloadp nf))
(unless (get symbol 'advice--pending)
(put symbol 'advice--pending :advice--pending))
(get symbol 'advice--pending))
(t (symbol-function symbol)))
function props)
@ -416,6 +419,8 @@ of the piece of advice."
function)
(unless (advice--p (advice--symbol-function symbol))
;; Not advised any more.
(when (eq (get symbol 'advice--pending) :advice--pending)
(put symbol 'advice--pending nil))
(remove-function (get symbol 'defalias-fset-function)
#'advice--defalias-fset)
(let ((asr (get symbol 'advice--saved-rewrite)))