User: scop
Date: 06/08/15 13:29:27
Modified: packages/unsupported/scop/vc ChangeLog vc-git.el
Log:
Avoid failures if git is not installed.
Revision Changes Path
1.60 +5 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- ChangeLog 2006/08/05 09:16:33 1.59
+++ ChangeLog 2006/08/15 11:29:26 1.60
@@ -1,3 +1,8 @@
+2006-08-15 Ville Skyttä <scop(a)xemacs.org>
+
+ * vc-git.el (vc-git-registered): Avoid failures if `git' is not
+ installed, thanks to Adrian Aichner for the catch.
+
2006-08-05 Ville Skyttä <scop(a)xemacs.org>
* vc.el: Sync with upstream.
1.3 +2 -1 XEmacs/packages/unsupported/scop/vc/vc-git.el
Index: vc-git.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-git.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vc-git.el 2006/08/05 09:16:34 1.2
+++ vc-git.el 2006/08/15 11:29:26 1.3
@@ -54,7 +54,8 @@
(let* ((dir (file-name-directory file))
(name (file-relative-name file dir)))
(when dir (cd dir))
- (and (eq 0 (call-process "git" nil '(t nil) nil "ls-files"
"-c" "-z" "--" name))
+ ;; XEmacs change: ignore errors (eg. if "git" is not installed)
+ (and (ignore-errors (eq 0 (call-process "git" nil '(t nil) nil
"ls-files" "-c" "-z" "--" name)))
(let ((str (buffer-string)))
(and (> (length str) (length name))
(string= (substring str 0 (1+ (length name))) (concat name
"\0"))))))))
Show replies by date