diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-02-11 21:27:53 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-02-11 21:27:53 -0500 |
| commit | c530e1c2a3a036d71942c354ba11b30a06341fd7 (patch) | |
| tree | 184fa6b6c9bb58855aa9f1ae6cded97edc4f10fb /lisp/emacs-lisp/edebug.el | |
| parent | 295fb2ac59b66c0e2470325a42c8e58c135ed044 (diff) | |
| parent | e0e36cac4adaa32ad755a34c811366dd8e4655bc (diff) | |
| download | emacs-c530e1c2a3a036d71942c354ba11b30a06341fd7.tar.gz emacs-c530e1c2a3a036d71942c354ba11b30a06341fd7.tar.bz2 emacs-c530e1c2a3a036d71942c354ba11b30a06341fd7.zip | |
Merge from trunk
Diffstat (limited to 'lisp/emacs-lisp/edebug.el')
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 7932309cff4..d711ba59a42 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -3396,7 +3396,7 @@ go to the end of the last sexp, or if that is the same point, then step." ;; Return the function symbol, or nil if not instrumented. (let ((func-marker (get func 'edebug))) (cond - ((markerp func-marker) + ((and (markerp func-marker) (marker-buffer func-marker)) ;; It is uninstrumented, so instrument it. (with-current-buffer (marker-buffer func-marker) (goto-char func-marker) |