From 7be63529323371bd513fdbe23401f2db0b34e3c8 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sat, 2 Jun 2012 18:07:37 +0200 Subject: [PATCH] Make org-version more robust * lisp/org.el (org-version): Make org-version more robust, e.g. when byte-compiling single files with 'make compile-dirty'. --- lisp/org.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/org.el b/lisp/org.el index 0157e36db..b89889dc7 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -222,6 +222,10 @@ With prefix arg HERE, insert it at point." (interactive "P") (let* ((org-dir (ignore-errors (org-find-library-dir "org"))) (org-install-dir (ignore-errors (org-find-library-dir "org-install.el"))) + (org-trash (or + (and (fboundp 'org-release) (fboundp 'org-git-version)) + (load (concat org-dir "org-version.el") + 'noerror 'nomessage 'nosuffix))) (org-version (org-release)) (git-version (org-git-version)) (version (format "Org-mode version %s (%s @ %s)" -- 2.11.4.GIT