emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r103213: * lisp/emacs-lisp/edebug.el


From: Stefan Monnier
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r103213: * lisp/emacs-lisp/edebug.el (edebug-instrument-function): Check a marker is
Date: Thu, 10 Feb 2011 14:21:07 -0500
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 103213
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2011-02-10 14:21:07 -0500
message:
  * lisp/emacs-lisp/edebug.el (edebug-instrument-function): Check a marker is
  still valid before using it.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/edebug.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-10 19:13:31 +0000
+++ b/lisp/ChangeLog    2011-02-10 19:21:07 +0000
@@ -1,5 +1,8 @@
 2011-02-10  Stefan Monnier  <address@hidden>
 
+       * 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
        `message' -> `compilation-message' rename (bug#8004).
 

=== modified file 'lisp/emacs-lisp/edebug.el'
--- a/lisp/emacs-lisp/edebug.el 2011-01-25 04:08:28 +0000
+++ b/lisp/emacs-lisp/edebug.el 2011-02-10 19:21:07 +0000
@@ -3394,7 +3394,7 @@
   ;; 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)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]