aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/vc-hooks.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index d4146b354b6..e14d4c2cea0 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -308,7 +308,8 @@ value of this flag.")
308 ((string-match "Needs Merge" status) 308 ((string-match "Needs Merge" status)
309 (vc-file-setprop file 'vc-cvs-status 'needs-merge)) 309 (vc-file-setprop file 'vc-cvs-status 'needs-merge))
310 (t (vc-file-setprop file 'vc-cvs-status nil)))))) 310 (t (vc-file-setprop file 'vc-cvs-status nil))))))
311 (kill-buffer (current-buffer)))) 311 (if (get-buffer "*vc-info*")
312 (kill-buffer (get-buffer "*vc-info*")))))
312 313
313;;; Functions that determine property values, by examining the 314;;; Functions that determine property values, by examining the
314;;; working file, the master file, or log program output 315;;; working file, the master file, or log program output