diff options
| author | Bastien Guerry <bzg@gnu.org> | 2014-01-07 14:22:53 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2014-01-07 14:22:53 +0100 |
| commit | 3c8b09ca2e01b0ef0c1b6651fab54194f0019fdc (patch) | |
| tree | ca02feb436782a74af050f15c02843da84a95f4a /lisp/org/org-attach.el | |
| parent | 2b6b4f204c819569734c092532d56da85eef503b (diff) | |
| download | emacs-3c8b09ca2e01b0ef0c1b6651fab54194f0019fdc.tar.gz emacs-3c8b09ca2e01b0ef0c1b6651fab54194f0019fdc.tar.bz2 emacs-3c8b09ca2e01b0ef0c1b6651fab54194f0019fdc.zip | |
Merge Org version 8.2.5c.
Diffstat (limited to 'lisp/org/org-attach.el')
| -rw-r--r-- | lisp/org/org-attach.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/org/org-attach.el b/lisp/org/org-attach.el index 2c291a07622..07307e68f6f 100644 --- a/lisp/org/org-attach.el +++ b/lisp/org/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 |