summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2011-02-10 14:21:07 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2011-02-10 14:21:07 -0500
commit49ffc0786e71f1659f87a9ea9cc321d83b1a1d68 (patch)
tree93b51b004f6a93c0b812ebfbc58f864f66cad037 /lisp/emacs-lisp
parent1a0a6cefcf2863adeabaac645a0176f95a380d25 (diff)
downloademacs-49ffc0786e71f1659f87a9ea9cc321d83b1a1d68.tar.gz
emacs-49ffc0786e71f1659f87a9ea9cc321d83b1a1d68.tar.bz2
emacs-49ffc0786e71f1659f87a9ea9cc321d83b1a1d68.zip
* lisp/emacs-lisp/edebug.el (edebug-instrument-function): Check a marker is
still valid before using it.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/edebug.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index f281521841c..70a7983dbea 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -3394,7 +3394,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)