* lisp/emacs-lisp/nadvice.el (advice--make-docstring): Try harder to find
[bpt/emacs.git] / lisp / emacs-lisp / nadvice.el
CommitLineData
231d8498
SM
1;;; nadvice.el --- Light-weight advice primitives for Elisp functions -*- lexical-binding: t -*-
2
ba318903 3;; Copyright (C) 2012-2014 Free Software Foundation, Inc.
231d8498
SM
4
5;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
6;; Keywords: extensions, lisp, tools
7;; Package: emacs
8
9;; This program is free software; you can redistribute it and/or modify
10;; it under the terms of the GNU General Public License as published by
11;; the Free Software Foundation, either version 3 of the License, or
12;; (at your option) any later version.
13
14;; This program is distributed in the hope that it will be useful,
15;; but WITHOUT ANY WARRANTY; without even the implied warranty of
16;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17;; GNU General Public License for more details.
18
19;; You should have received a copy of the GNU General Public License
20;; along with this program. If not, see <http://www.gnu.org/licenses/>.
21
22;;; Commentary:
23
24;; This package lets you add behavior (which we call "piece of advice") to
25;; existing functions, like the old `advice.el' package, but with much fewer
8725b746 26;; bells and whistles. It comes in 2 parts:
231d8498
SM
27;;
28;; - The first part lets you add/remove functions, similarly to
29;; add/remove-hook, from any "place" (i.e. as accepted by `setf') that
30;; holds a function.
31;; This part provides mainly 2 macros: `add-function' and `remove-function'.
32;;
a77b8d5e 33;; - The second part provides `advice-add' and `advice-remove' which are
231d8498
SM
34;; refined version of the previous macros specially tailored for the case
35;; where the place that we want to modify is a `symbol-function'.
36
37;;; Code:
38
39;;;; Lightweight advice/hook
40(defvar advice--where-alist
41 '((:around "\300\301\302\003#\207" 5)
42 (:before "\300\301\002\"\210\300\302\002\"\207" 4)
43 (:after "\300\302\002\"\300\301\003\"\210\207" 5)
bcd7a0a4 44 (:override "\300\301\ 2\"\207" 4)
231d8498
SM
45 (:after-until "\300\302\002\"\206\013\000\300\301\002\"\207" 4)
46 (:after-while "\300\302\002\"\205\013\000\300\301\002\"\207" 4)
47 (:before-until "\300\301\002\"\206\013\000\300\302\002\"\207" 4)
d36ed1c8
SM
48 (:before-while "\300\301\002\"\205\013\000\300\302\002\"\207" 4)
49 (:filter-args "\300\302\301\ 3!\"\207" 5)
50 (:filter-return "\301\300\302\ 3\"!\207" 5))
231d8498
SM
51 "List of descriptions of how to add a function.
52Each element has the form (WHERE BYTECODE STACK) where:
53 WHERE is a keyword indicating where the function is added.
54 BYTECODE is the corresponding byte-code that will be used.
55 STACK is the amount of stack space needed by the byte-code.")
56
57(defvar advice--bytecodes (mapcar #'cadr advice--where-alist))
58
59(defun advice--p (object)
60 (and (byte-code-function-p object)
61 (eq 128 (aref object 0))
62 (memq (length object) '(5 6))
63 (memq (aref object 1) advice--bytecodes)
64 (eq #'apply (aref (aref object 2) 0))))
65
66(defsubst advice--car (f) (aref (aref f 2) 1))
67(defsubst advice--cdr (f) (aref (aref f 2) 2))
68(defsubst advice--props (f) (aref (aref f 2) 3))
69
70e5a261
SM
70(defun advice--cd*r (f)
71 (while (advice--p f)
72 (setq f (advice--cdr f)))
73 f)
74
0d53f628
CY
75(defun advice--make-docstring (function)
76 "Build the raw docstring for FUNCTION, presumably advised."
049fac7c
SM
77 (let* ((flist (indirect-function function))
78 (docfun nil)
79 (docstring nil))
231d8498
SM
80 (if (eq 'macro (car-safe flist)) (setq flist (cdr flist)))
81 (while (advice--p flist)
82 (let ((bytecode (aref flist 1))
049fac7c 83 (doc (aref flist 4))
231d8498 84 (where nil))
049fac7c
SM
85 ;; Hack attack! For advices installed before calling
86 ;; Snarf-documentation, the integer offset into the DOC file will not
87 ;; be installed in the "core unadvised function" but in the advice
88 ;; object instead! So here we try to undo the damage.
89 (if (integerp doc) (setq docfun flist))
231d8498
SM
90 (dolist (elem advice--where-alist)
91 (if (eq bytecode (cadr elem)) (setq where (car elem))))
92 (setq docstring
93 (concat
94 docstring
95 (propertize (format "%s advice: " where)
96 'face 'warning)
97 (let ((fun (advice--car flist)))
98 (if (symbolp fun) (format "`%S'" fun)
99 (let* ((name (cdr (assq 'name (advice--props flist))))
100 (doc (documentation fun t))
101 (usage (help-split-fundoc doc function)))
102 (if usage (setq doc (cdr usage)))
103 (if name
104 (if doc
105 (format "%s\n%s" name doc)
106 (format "%s" name))
107 (or doc "No documentation")))))
108 "\n")))
109 (setq flist (advice--cdr flist)))
110 (if docstring (setq docstring (concat docstring "\n")))
049fac7c
SM
111 (unless docfun (setq docfun flist))
112 (let* ((origdoc (unless (eq function docfun) ;Avoid inf-loops.
113 (documentation docfun t)))
231d8498
SM
114 (usage (help-split-fundoc origdoc function)))
115 (setq usage (if (null usage)
116 (let ((arglist (help-function-arglist flist)))
117 (format "%S" (help-make-usage function arglist)))
118 (setq origdoc (cdr usage)) (car usage)))
119 (help-add-fundoc-usage (concat docstring origdoc) usage))))
120
1668ea90
SM
121(defun advice-eval-interactive-spec (spec)
122 "Evaluate the interactive spec SPEC."
123 (cond
124 ((stringp spec)
125 ;; There's no direct access to the C code (in call-interactively) that
126 ;; processes those specs, but that shouldn't stop us, should it?
127 ;; FIXME: Despite appearances, this is not faithful: SPEC and
128 ;; (advice-eval-interactive-spec SPEC) will behave subtly differently w.r.t
129 ;; command-history (and maybe a few other details).
130 (call-interactively `(lambda (&rest args) (interactive ,spec) args)))
131 ;; ((functionp spec) (funcall spec))
132 (t (eval spec))))
133
adbfe42c
SM
134(defun advice--interactive-form (function)
135 ;; Like `interactive-form' but tries to avoid autoloading functions.
136 (when (commandp function)
137 (if (not (and (symbolp function) (autoloadp (symbol-function function))))
138 (interactive-form function)
139 `(interactive (advice-eval-interactive-spec
140 (cadr (interactive-form ',function)))))))
141
231d8498 142(defun advice--make-interactive-form (function main)
231d8498
SM
143 ;; TODO: make it so that interactive spec can be a constant which
144 ;; dynamically checks the advice--car/cdr to do its job.
1668ea90 145 ;; For that, advice-eval-interactive-spec needs to be more faithful.
adbfe42c
SM
146 (let* ((iff (advice--interactive-form function))
147 (ifm (advice--interactive-form main))
148 (fspec (cadr iff)))
47f01a8a 149 (when (eq 'function (car-safe fspec)) ;; Macroexpanded lambda?
1668ea90
SM
150 (setq fspec (nth 1 fspec)))
151 (if (functionp fspec)
adbfe42c
SM
152 `(funcall ',fspec ',(cadr ifm))
153 (cadr (or iff ifm)))))
231d8498 154
adbfe42c 155(defun advice--make-1 (byte-code stack-depth function main props)
231d8498
SM
156 "Build a function value that adds FUNCTION to MAIN."
157 (let ((adv-sig (gethash main advertised-signature-table))
158 (advice
159 (apply #'make-byte-code 128 byte-code
1ea22560 160 (vector #'apply function main props) stack-depth nil
cb3a1380 161 (and (or (commandp function) (commandp main))
cb3a1380
SM
162 (list (advice--make-interactive-form
163 function main))))))
231d8498
SM
164 (when adv-sig (puthash advice adv-sig advertised-signature-table))
165 advice))
166
167(defun advice--make (where function main props)
168 "Build a function value that adds FUNCTION to MAIN at WHERE.
169WHERE is a symbol to select an entry in `advice--where-alist'."
cb3a1380
SM
170 (let ((fd (or (cdr (assq 'depth props)) 0))
171 (md (if (advice--p main)
172 (or (cdr (assq 'depth (advice--props main))) 0))))
173 (if (and md (> fd md))
174 ;; `function' should go deeper.
175 (let ((rest (advice--make where function (advice--cdr main) props)))
176 (advice--make-1 (aref main 1) (aref main 3)
177 (advice--car main) rest (advice--props main)))
178 (let ((desc (assq where advice--where-alist)))
179 (unless desc (error "Unknown add-function location `%S'" where))
180 (advice--make-1 (nth 1 desc) (nth 2 desc)
181 function main props)))))
231d8498 182
dabefae5 183(defun advice--member-p (function name definition)
231d8498
SM
184 (let ((found nil))
185 (while (and (not found) (advice--p definition))
186 (if (or (equal function (advice--car definition))
dabefae5
SM
187 (when name
188 (equal name (cdr (assq 'name (advice--props definition))))))
c67c0839 189 (setq found definition)
231d8498
SM
190 (setq definition (advice--cdr definition))))
191 found))
192
a731fc1b 193(defun advice--tweak (flist tweaker)
231d8498 194 (if (not (advice--p flist))
a731fc1b 195 (funcall tweaker nil flist nil)
231d8498 196 (let ((first (advice--car flist))
a731fc1b 197 (rest (advice--cdr flist))
231d8498 198 (props (advice--props flist)))
cb9c0a53
SM
199 (let ((val (funcall tweaker first rest props)))
200 (if val (car val)
a731fc1b
SM
201 (let ((nrest (advice--tweak rest tweaker)))
202 (if (eq rest nrest) flist
203 (advice--make-1 (aref flist 1) (aref flist 3)
cb9c0a53 204 first nrest props))))))))
a731fc1b
SM
205
206;;;###autoload
207(defun advice--remove-function (flist function)
208 (advice--tweak flist
209 (lambda (first rest props)
cb9c0a53
SM
210 (cond ((not first) rest)
211 ((or (equal function first)
a731fc1b 212 (equal function (cdr (assq 'name props))))
cb9c0a53 213 (list rest))))))
231d8498 214
1d44e9dc
SM
215(defvar advice--buffer-local-function-sample nil
216 "keeps an example of the special \"run the default value\" functions.
217These functions play the same role as t in buffer-local hooks, and to recognize
218them, we keep a sample here against which to compare. Each instance is
219different, but `function-equal' will hopefully ignore those differences.")
a61428c4
SM
220
221(defun advice--set-buffer-local (var val)
222 (if (function-equal val advice--buffer-local-function-sample)
223 (kill-local-variable var)
224 (set (make-local-variable var) val)))
225
226;;;###autoload
227(defun advice--buffer-local (var)
228 "Buffer-local value of VAR, presumed to contain a function."
229 (declare (gv-setter advice--set-buffer-local))
230 (if (local-variable-p var) (symbol-value var)
231 (setq advice--buffer-local-function-sample
1d44e9dc 232 ;; This function acts like the t special value in buffer-local hooks.
a61428c4
SM
233 (lambda (&rest args) (apply (default-value var) args)))))
234
231d8498
SM
235;;;###autoload
236(defmacro add-function (where place function &optional props)
237 ;; TODO:
a61428c4 238 ;; - maybe let `where' specify some kind of predicate and use it
231d8498 239 ;; to implement things like mode-local or eieio-defmethod.
a61428c4
SM
240 ;; Of course, that only makes sense if the predicates of all advices can
241 ;; be combined and made more efficient.
231d8498
SM
242 ;; :before is like a normal add-hook on a normal hook.
243 ;; :before-while is like add-hook on run-hook-with-args-until-failure.
244 ;; :before-until is like add-hook on run-hook-with-args-until-success.
245 ;; Same with :after-* but for (add-hook ... 'append).
246 "Add a piece of advice on the function stored at PLACE.
247FUNCTION describes the code to add. WHERE describes where to add it.
248WHERE can be explained by showing the resulting new function, as the
249result of combining FUNCTION and the previous value of PLACE, which we
250call OLDFUN here:
251`:before' (lambda (&rest r) (apply FUNCTION r) (apply OLDFUN r))
252`:after' (lambda (&rest r) (prog1 (apply OLDFUN r) (apply FUNCTION r)))
253`:around' (lambda (&rest r) (apply FUNCTION OLDFUN r))
bcd7a0a4 254`:override' (lambda (&rest r) (apply FUNCTION r))
231d8498
SM
255`:before-while' (lambda (&rest r) (and (apply FUNCTION r) (apply OLDFUN r)))
256`:before-until' (lambda (&rest r) (or (apply FUNCTION r) (apply OLDFUN r)))
257`:after-while' (lambda (&rest r) (and (apply OLDFUN r) (apply FUNCTION r)))
258`:after-until' (lambda (&rest r) (or (apply OLDFUN r) (apply FUNCTION r)))
d36ed1c8
SM
259`:filter-args' (lambda (&rest r) (apply OLDFUN (funcall FUNCTION r)))
260`:filter-return'(lambda (&rest r) (funcall FUNCTION (apply OLDFUN r)))
231d8498
SM
261If FUNCTION was already added, do nothing.
262PROPS is an alist of additional properties, among which the following have
263a special meaning:
1668ea90 264- `name': a string or symbol. It can be used to refer to this piece of advice.
cb3a1380
SM
265- `depth': a number indicating a preference w.r.t ordering.
266 The default depth is 0. By convention, a depth of 100 means that
267 the advice should be innermost (i.e. at the end of the list),
268 whereas a depth of -100 means that the advice should be outermost.
1668ea90 269
36c0a301
SM
270If PLACE is a simple variable, only its global value will be affected.
271Use (local 'VAR) if you want to apply FUNCTION to VAR buffer-locally.
a61428c4 272
1668ea90
SM
273If one of FUNCTION or OLDFUN is interactive, then the resulting function
274is also interactive. There are 3 cases:
275- FUNCTION is not interactive: the interactive spec of OLDFUN is used.
276- The interactive spec of FUNCTION is itself a function: it should take one
277 argument (the interactive spec of OLDFUN, which it can pass to
278 `advice-eval-interactive-spec') and return the list of arguments to use.
279- Else, use the interactive spec of FUNCTION and ignore the one of OLDFUN."
231d8498 280 (declare (debug t)) ;;(indent 2)
a61428c4
SM
281 (cond ((eq 'local (car-safe place))
282 (setq place `(advice--buffer-local ,@(cdr place))))
283 ((symbolp place)
36c0a301 284 (setq place `(default-value ',place))))
231d8498
SM
285 `(advice--add-function ,where (gv-ref ,place) ,function ,props))
286
287;;;###autoload
288(defun advice--add-function (where ref function props)
c67c0839
SM
289 (let ((a (advice--member-p function (cdr (assq 'name props))
290 (gv-deref ref))))
291 (when a
292 ;; The advice is already present. Remove the old one, first.
293 (setf (gv-deref ref)
294 (advice--remove-function (gv-deref ref) (advice--car a))))
231d8498
SM
295 (setf (gv-deref ref)
296 (advice--make where function (gv-deref ref) props))))
297
bcd7a0a4 298;;;###autoload
231d8498
SM
299(defmacro remove-function (place function)
300 "Remove the FUNCTION piece of advice from PLACE.
301If FUNCTION was not added to PLACE, do nothing.
302Instead of FUNCTION being the actual function, it can also be the `name'
303of the piece of advice."
304 (declare (debug t))
a61428c4
SM
305 (cond ((eq 'local (car-safe place))
306 (setq place `(advice--buffer-local ,@(cdr place))))
307 ((symbolp place)
986545b5 308 (setq place `(default-value ',place))))
231d8498
SM
309 (gv-letplace (getter setter) place
310 (macroexp-let2 nil new `(advice--remove-function ,getter ,function)
311 `(unless (eq ,new ,getter) ,(funcall setter new)))))
312
1d44e9dc
SM
313(defun advice-function-mapc (f function-def)
314 "Apply F to every advice function in FUNCTION-DEF.
315F is called with two arguments: the function that was added, and the
316properties alist that was specified when it was added."
317 (while (advice--p function-def)
318 (funcall f (advice--car function-def) (advice--props function-def))
319 (setq function-def (advice--cdr function-def))))
320
321(defun advice-function-member-p (advice function-def)
322 "Return non-nil if ADVICE is already in FUNCTION-DEF.
323Instead of ADVICE being the actual function, it can also be the `name'
324of the piece of advice."
325 (advice--member-p advice advice function-def))
326
231d8498
SM
327;;;; Specific application of add-function to `symbol-function' for advice.
328
329(defun advice--subst-main (old new)
a731fc1b
SM
330 (advice--tweak old
331 (lambda (first _rest _props) (if (not first) new))))
231d8498 332
413d4689
SM
333(defun advice--normalize (symbol def)
334 (cond
335 ((special-form-p def)
336 ;; Not worth the trouble trying to handle this, I think.
1d44e9dc 337 (error "Advice impossible: %S is a special form" symbol))
671d5c16
SM
338 ((and (symbolp def) (macrop def))
339 (let ((newval `(macro . ,(lambda (&rest r) (macroexpand `(,def . ,r))))))
1d44e9dc 340 (put symbol 'advice--saved-rewrite (cons def (cdr newval)))
413d4689
SM
341 newval))
342 ;; `f' might be a pure (hence read-only) cons!
343 ((and (eq 'macro (car-safe def))
344 (not (ignore-errors (setcdr def (cdr def)) t)))
345 (cons 'macro (cdr def)))
346 (t def)))
347
348(defsubst advice--strip-macro (x)
349 (if (eq 'macro (car-safe x)) (cdr x) x))
350
1d44e9dc
SM
351(defun advice--symbol-function (symbol)
352 ;; The value conceptually stored in `symbol-function' is split into two
353 ;; parts:
354 ;; - the normal function definition.
355 ;; - the list of advice applied to it.
356 ;; `advice--symbol-function' is intended to return the second part (i.e. the
357 ;; list of advice, which includes a hole at the end which typically holds the
358 ;; first part, but this function doesn't care much which value is found
359 ;; there).
360 ;; In the "normal" state both parts are combined into a single value stored
361 ;; in the "function slot" of the symbol. But the way they are combined is
362 ;; different depending on whether the definition is a function or a macro.
363 ;; Also if the function definition is nil (i.e. unbound) or is an autoload,
364 ;; the second part is stashed away temporarily in the `advice--pending'
365 ;; symbol property.
366 (or (get symbol 'advice--pending)
367 (advice--strip-macro (symbol-function symbol))))
368
231d8498 369(defun advice--defalias-fset (fsetfun symbol newdef)
1d44e9dc 370 (unless fsetfun (setq fsetfun #'fset))
413d4689
SM
371 (when (get symbol 'advice--saved-rewrite)
372 (put symbol 'advice--saved-rewrite nil))
373 (setq newdef (advice--normalize symbol newdef))
671d5c16 374 (let ((oldadv (advice--symbol-function symbol)))
539f75f4
SM
375 (if (and newdef (not (autoloadp newdef)))
376 (let* ((snewdef (advice--strip-macro newdef))
377 (snewadv (advice--subst-main oldadv snewdef)))
378 (put symbol 'advice--pending nil)
1d44e9dc 379 (funcall fsetfun symbol
539f75f4
SM
380 (if (eq snewdef newdef) snewadv (cons 'macro snewadv))))
381 (unless (eq oldadv (get symbol 'advice--pending))
382 (put symbol 'advice--pending (advice--subst-main oldadv nil)))
1d44e9dc 383 (funcall fsetfun symbol newdef))))
231d8498
SM
384
385;;;###autoload
386(defun advice-add (symbol where function &optional props)
387 "Like `add-function' but for the function named SYMBOL.
388Contrary to `add-function', this will properly handle the cases where SYMBOL
389is defined as a macro, alias, command, ..."
390 ;; TODO:
391 ;; - record the advice location, to display in describe-function.
392 ;; - change all defadvice in lisp/**/*.el.
231d8498 393 ;; - obsolete advice.el.
539f75f4 394 (let* ((f (symbol-function symbol))
413d4689 395 (nf (advice--normalize symbol f)))
1d44e9dc 396 (unless (eq f nf) (fset symbol nf))
231d8498 397 (add-function where (cond
413d4689 398 ((eq (car-safe nf) 'macro) (cdr nf))
1668ea90
SM
399 ;; Reasons to delay installation of the advice:
400 ;; - If the function is not yet defined, installing
401 ;; the advice would affect `fboundp'ness.
adbfe42c
SM
402 ;; - the symbol-function slot of an autoloaded
403 ;; function is not itself a function value.
1668ea90
SM
404 ;; - `autoload' does nothing if the function is
405 ;; not an autoload or undefined.
406 ((or (not nf) (autoloadp nf))
231d8498
SM
407 (get symbol 'advice--pending))
408 (t (symbol-function symbol)))
409 function props)
0d53f628 410 (put symbol 'function-documentation `(advice--make-docstring ',symbol))
231d8498
SM
411 (add-function :around (get symbol 'defalias-fset-function)
412 #'advice--defalias-fset))
413 nil)
414
415;;;###autoload
416(defun advice-remove (symbol function)
417 "Like `remove-function' but for the function named SYMBOL.
539f75f4
SM
418Contrary to `remove-function', this also works when SYMBOL is a macro
419or an autoload and it preserves `fboundp'.
231d8498
SM
420Instead of the actual function to remove, FUNCTION can also be the `name'
421of the piece of advice."
539f75f4 422 (let ((f (symbol-function symbol)))
1d44e9dc
SM
423 (remove-function (cond ;This is `advice--symbol-function' but as a "place".
424 ((get symbol 'advice--pending)
425 (get symbol 'advice--pending))
426 ((eq (car-safe f) 'macro) (cdr f))
427 (t (symbol-function symbol)))
539f75f4 428 function)
671d5c16 429 (unless (advice--p (advice--symbol-function symbol))
539f75f4
SM
430 (remove-function (get symbol 'defalias-fset-function)
431 #'advice--defalias-fset)
1d44e9dc
SM
432 (let ((asr (get symbol 'advice--saved-rewrite)))
433 (and asr (eq (cdr-safe (symbol-function symbol))
434 (cdr asr))
435 (fset symbol (car (get symbol 'advice--saved-rewrite)))))))
539f75f4
SM
436 nil)
437
1d44e9dc
SM
438(defun advice-mapc (fun symbol)
439 "Apply FUN to every advice function in SYMBOL.
539f75f4
SM
440FUN is called with a two arguments: the function that was added, and the
441properties alist that was specified when it was added."
1d44e9dc 442 (advice-function-mapc fun (advice--symbol-function symbol)))
231d8498
SM
443
444;;;###autoload
1d44e9dc
SM
445(defun advice-member-p (advice symbol)
446 "Return non-nil if ADVICE has been added to SYMBOL.
413d4689 447Instead of ADVICE being the actual function, it can also be the `name'
231d8498 448of the piece of advice."
1d44e9dc 449 (advice-function-member-p advice (advice--symbol-function symbol)))
231d8498 450
23ba2705
SM
451;; When code is advised, called-interactively-p needs to be taught to skip
452;; the advising frames.
453;; FIXME: This Major Ugly Hack won't handle calls to called-interactively-p
454;; done from the advised function if the deepest advice is an around advice!
455;; In other cases (calls from an advice or calls from the advised function when
456;; the deepest advice is not an around advice), it should hopefully get
457;; it right.
458(add-hook 'called-interactively-p-functions
459 #'advice--called-interactively-skip)
460(defun advice--called-interactively-skip (origi frame1 frame2)
461 (let* ((i origi)
462 (get-next-frame
463 (lambda ()
464 (setq frame1 frame2)
7ced0d04 465 (setq frame2 (backtrace-frame i #'called-interactively-p))
23ba2705
SM
466 ;; (message "Advice Frame %d = %S" i frame2)
467 (setq i (1+ i)))))
468 (when (and (eq (nth 1 frame2) 'apply)
469 (progn
470 (funcall get-next-frame)
471 (advice--p (indirect-function (nth 1 frame2)))))
472 (funcall get-next-frame)
473 ;; If we now have the symbol, this was the head advice and
474 ;; we're done.
475 (while (advice--p (nth 1 frame1))
476 ;; This was an inner advice called from some earlier advice.
477 ;; The stack frames look different depending on the particular
478 ;; kind of the earlier advice.
479 (let ((inneradvice (nth 1 frame1)))
480 (if (and (eq (nth 1 frame2) 'apply)
481 (progn
482 (funcall get-next-frame)
483 (advice--p (indirect-function
484 (nth 1 frame2)))))
485 ;; The earlier advice was something like a before/after
486 ;; advice where the "next" code is called directly by the
487 ;; advice--p object.
488 (funcall get-next-frame)
489 ;; It's apparently an around advice, where the "next" is
490 ;; called by the body of the advice in any way it sees fit,
491 ;; so we need to skip the frames of that body.
492 (while
493 (progn
494 (funcall get-next-frame)
495 (not (and (eq (nth 1 frame2) 'apply)
496 (eq (nth 3 frame2) inneradvice)))))
497 (funcall get-next-frame)
498 (funcall get-next-frame))))
499 (- i origi 1))))
500
231d8498
SM
501
502(provide 'nadvice)
503;;; nadvice.el ends here