From cb8600b1ba15565f696ebfd34fc169508678262b Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sun, 6 Nov 2011 18:36:19 +0100 Subject: [PATCH] show installation path or org-install.el to avoid mishaps with multiple installations * lisp/org.el (org-version): show the full path to org-install.el in the version string to avoid confusion if multiple installations exist or a previously loaded org-install.el has already defined a version string that is now out of date. --- lisp/org.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 988815787..13801484c 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -111,6 +111,7 @@ (declare-function org-at-clock-log-p "org-clock" ()) (declare-function org-clock-timestamps-up "org-clock" ()) (declare-function org-clock-timestamps-down "org-clock" ()) +(declare-function find-library-name "find-func") ;; babel (require 'ob) @@ -208,6 +209,7 @@ identifier." ;;; Version +;;;###autoload (defun org-version (&optional here) "Show the org-mode version in the echo area. With prefix arg HERE, insert it at point." @@ -215,8 +217,11 @@ With prefix arg HERE, insert it at point." (let* ((origin default-directory) (version (if (boundp 'org-release) org-release "N/A")) (git-version (if (boundp 'org-git-version) org-git-version "N/A")) - (dir (concat (file-name-directory (locate-library "org")) "../" ))) - (setq version (format "Org-mode version %s (%s)" version git-version)) + (org-install (ignore-errors (find-library-name "org-install")))) + (setq version (format "Org-mode version %s (%s @ %s)" + version + git-version + (if org-install org-install "org-install.el can not be found!"))) (if here (insert version)) (message version)))