diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-07-21 19:09:12 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-07-21 19:09:12 -0400 |
| commit | 5abadebc353cdb55a162a7f35a299623537cd3a8 (patch) | |
| tree | 4a7d9f6021c10c0f75a9cd4d746b310e99d0ba91 /lisp/emacs-lisp | |
| parent | 492ea2410c6aab25a1d02cb576bb1df536c3f57c (diff) | |
| download | emacs-5abadebc353cdb55a162a7f35a299623537cd3a8.tar.gz emacs-5abadebc353cdb55a162a7f35a299623537cd3a8.tar.bz2 emacs-5abadebc353cdb55a162a7f35a299623537cd3a8.zip | |
(advice--called-interactively-skip): Fix inf-loop (bug#21083)
* lisp/emacs-lisp/nadvice.el (advice--called-interactively-skip):
Fix inf-loop (bug#21083).
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/nadvice.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el index a6db5e9e696..5a59a980feb 100644 --- a/lisp/emacs-lisp/nadvice.el +++ b/lisp/emacs-lisp/nadvice.el @@ -522,8 +522,9 @@ of the piece of advice." (while (progn (funcall get-next-frame) - (not (and (eq (nth 1 frame2) 'apply) - (eq (nth 3 frame2) inneradvice))))) + (and frame2 + (not (and (eq (nth 1 frame2) 'apply) + (eq (nth 3 frame2) inneradvice)))))) (funcall get-next-frame) (funcall get-next-frame)))) (- i origi 1)))) |