diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-10 17:32:13 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-10 17:32:13 -0800 |
| commit | 78998ca9cf65cc65579c8b756d35a2db9d3c8ef7 (patch) | |
| tree | d897294f854a85c547b4630fcc3d2bab96285a88 /lisp/emacs-lisp/edebug.el | |
| parent | 2098fd549f4c8a00246324a35de6af8144f5b628 (diff) | |
| parent | 5708ce5e83340d735ca9b87f028caf0bf5709b6e (diff) | |
| download | emacs-78998ca9cf65cc65579c8b756d35a2db9d3c8ef7.tar.gz emacs-78998ca9cf65cc65579c8b756d35a2db9d3c8ef7.tar.bz2 emacs-78998ca9cf65cc65579c8b756d35a2db9d3c8ef7.zip | |
Merge from mainline.
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 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) |