diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-01-06 16:02:38 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-01-06 16:02:38 +0000 |
| commit | cc72026bcacf63f7c62c8e711cba8758fdb6202c (patch) | |
| tree | 7333ba41df15eb321d1dd801800fd25534b69fc1 | |
| parent | effb6952745e54189a4ab68f550476c33992c8cb (diff) | |
| download | emacs-cc72026bcacf63f7c62c8e711cba8758fdb6202c.tar.gz emacs-cc72026bcacf63f7c62c8e711cba8758fdb6202c.tar.bz2 emacs-cc72026bcacf63f7c62c8e711cba8758fdb6202c.zip | |
(vc-ensure-vc-buffer): Check liveness of vc-parent-buffer.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc.el | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4896c2c1f14..095ef8e6783 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-01-06 Stefan Monnier <monnier@iro.umontreal.ca> + + * vc.el (vc-ensure-vc-buffer): Check liveness of vc-parent-buffer. + 2008-01-06 Dan Nicolaescu <dann@ics.uci.edu> * vc.el (vc-status-fileinfo): New defstruct. diff --git a/lisp/vc.el b/lisp/vc.el index 9e5df686546..61a2c67d9d4 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -1310,6 +1310,7 @@ Otherwise, throw an error." (if vc-dired-mode (set-buffer (find-file-noselect (dired-get-filename))) (while (and vc-parent-buffer + (buffer-live-p vc-parent-buffer) ;; Avoid infinite looping when vc-parent-buffer and ;; current buffer are the same buffer. (not (eq vc-parent-buffer (current-buffer)))) |