summaryrefslogtreecommitdiff
path: root/lisp/vc-hooks.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-07-07 13:24:31 +0000
committerRichard M. Stallman <rms@gnu.org>1995-07-07 13:24:31 +0000
commita8c655c6ead1084bb2665a890cf6b20df8b1bc4d (patch)
treee3eed80c131ef5b563e9f328154111cd732d2955 /lisp/vc-hooks.el
parent88fe1373b5fbb685295156e3f7b3cf68323b3e86 (diff)
downloademacs-a8c655c6ead1084bb2665a890cf6b20df8b1bc4d.tar.gz
(vc-fetch-master-properties): Better error
message in case the "cvs status" command fails.
Diffstat (limited to 'lisp/vc-hooks.el')
-rw-r--r--lisp/vc-hooks.el11
1 files changed, 8 insertions, 3 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 1ae9ecfe642..65b2599e2c4 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -280,15 +280,20 @@ value of this flag.")
;; command, because that would change its default directory
(save-excursion (set-buffer (get-buffer-create "*vc-info*"))
(erase-buffer))
- (let ((exec-path (append vc-path exec-path))
+ (let ((exec-path (append vc-path exec-path)) exec-status
;; Add vc-path to PATH for the execution of this command.
(process-environment
(cons (concat "PATH=" (getenv "PATH")
path-separator
(mapconcat 'identity vc-path path-separator))
process-environment)))
- (apply 'call-process "cvs" nil "*vc-info*" nil
- (list "status" file)))
+ (setq exec-status
+ (apply 'call-process "cvs" nil "*vc-info*" nil
+ (list "status" file)))
+ (cond ((> exec-status 0)
+ (switch-to-buffer (get-file-buffer file))
+ (display-buffer "*vc-info*")
+ (error "Couldn't find version control information"))))
(set-buffer (get-buffer "*vc-info*"))
(set-buffer-modified-p nil)
(auto-save-mode nil)