Commit 49ffc078 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/emacs-lisp/edebug.el (edebug-instrument-function): Check a marker is

still valid before using it.
parent 1a0a6cef
2011-02-10 Stefan Monnier <monnier@iro.umontreal.ca> 2011-02-10 Stefan Monnier <monnier@iro.umontreal.ca>
   
* emacs-lisp/edebug.el (edebug-instrument-function): Check a marker is
still valid before using it.
* progmodes/grep.el (grep-mode-font-lock-keywords): Adjust to * progmodes/grep.el (grep-mode-font-lock-keywords): Adjust to
`message' -> `compilation-message' rename (bug#8004). `message' -> `compilation-message' rename (bug#8004).
   
......
...@@ -3394,7 +3394,7 @@ go to the end of the last sexp, or if that is the same point, then step." ...@@ -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. ;; Return the function symbol, or nil if not instrumented.
(let ((func-marker (get func 'edebug))) (let ((func-marker (get func 'edebug)))
(cond (cond
((markerp func-marker) ((and (markerp func-marker) (marker-buffer func-marker))
;; It is uninstrumented, so instrument it. ;; It is uninstrumented, so instrument it.
(with-current-buffer (marker-buffer func-marker) (with-current-buffer (marker-buffer func-marker)
(goto-char func-marker) (goto-char func-marker)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment