diff options
| author | Richard M. Stallman | 1995-06-20 01:07:28 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-06-20 01:07:28 +0000 |
| commit | 3be2a3627fbfcab83cf04bd2c30d82dab4bc5855 (patch) | |
| tree | ba70c429abaffc76ef336de4c2b8f76871b48ce5 | |
| parent | f560db785ef4ee6f6ef740e87c6ed8d23f252adb (diff) | |
| download | emacs-3be2a3627fbfcab83cf04bd2c30d82dab4bc5855.tar.gz emacs-3be2a3627fbfcab83cf04bd2c30d82dab4bc5855.zip | |
(vc-fetch-master-properties): Be more careful
about killing the *vc-info* buffer.
| -rw-r--r-- | lisp/vc-hooks.el | 3 |
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 |