summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2012-06-02 18:07:37 +0200
committerBastien Guerry <bzg@altern.org>2012-06-04 08:41:02 +0200
commit7be63529323371bd513fdbe23401f2db0b34e3c8 (patch)
treed0192d2ae58503d85d81826027cd1535a0437cad
parent80d4f778c73534726394291dad13376b0b44be5b (diff)
downloadorg-mode-7be63529323371bd513fdbe23401f2db0b34e3c8.tar.gz
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'.
-rw-r--r--lisp/org.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 0157e36..b89889d 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)"