From 6a86f32c70d731630e550d7a6b85b845603a81cf Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 6 Dec 2013 15:22:50 +0100 Subject: [PATCH] org-attach.el: Check whether git is installed * org-attach.el (vc-git): Require. (org-attach-commit): Check whether git is installed. Thanks to Jonathan Leech-Pepin for reporting this. --- lisp/org-attach.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lisp/org-attach.el b/lisp/org-attach.el index 898d9116e..58ec2d127 100644 --- a/lisp/org-attach.el +++ b/lisp/org-attach.el @@ -41,8 +41,7 @@ (require 'cl)) (require 'org-id) (require 'org) - -(declare-function vc-git-root "vc-git" (file)) +(require 'vc-git) (defgroup org-attach nil "Options concerning entry attachments in Org-mode." @@ -266,7 +265,7 @@ This checks for the existence of a \".git\" directory in that directory." (let* ((dir (expand-file-name org-attach-directory)) (git-dir (vc-git-root dir)) (changes 0)) - (when git-dir + (when (and git-dir (executable-find "git")) (with-temp-buffer (cd dir) (let ((have-annex -- 2.11.4.GIT