changeset 86248:cde7fc4f5945

(vc-find-revision): Set the parent buffer. Use when instead of if.
author Dan Nicolaescu <dann@ics.uci.edu>
date Tue, 20 Nov 2007 08:15:00 +0000
parents fc93e9674475
children ef17406635fe
files lisp/ChangeLog lisp/vc.el
diffstat 2 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Nov 20 07:56:02 2007 +0000
+++ b/lisp/ChangeLog	Tue Nov 20 08:15:00 2007 +0000
@@ -1,5 +1,8 @@
 2007-11-20  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* vc.el (vc-find-revision): Set the parent buffer.
+	Use when instead of if.
+
 	* progmodes/python.el (info-lookup-maybe-add-help):
 	* progmodes/ps-mode.el (doc-view-minor-mode):
 	* mail/emacsbug.el (Info-menu, Info-goto-node):
--- a/lisp/vc.el	Tue Nov 20 07:56:02 2007 +0000
+++ b/lisp/vc.el	Tue Nov 20 08:15:00 2007 +0000
@@ -2069,11 +2069,16 @@
 		      (with-current-buffer filebuf
 			(vc-call find-revision file revision outbuf))))
 		  (setq failed nil))
-	      (if (and failed (file-exists-p filename))
-		  (delete-file filename))))
+	      (when (and failed (file-exists-p filename))
+		(delete-file filename))))
 	  (vc-mode-line file))
 	(message "Checking out %s...done" filename)))
-    (find-file-noselect filename)))
+    (let ((result-buf (find-file-noselect filename)))
+      (with-current-buffer result-buf
+	;; Set the parent buffer so that things like 
+	;; C-x v g, C-x v l, ... etc work.
+	(setq vc-parent-buffer filebuf))
+      result-buf)))
 
 ;; Header-insertion code