summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-10-02 10:18:51 (GMT)
committer Bastien Guerry <bzg@altern.org>2012-10-02 10:18:51 (GMT)
commite1a01d50776d5c224fc27faf51369aeadb361fa4 (patch)
tree7e6de6554d5bfe0e1c72b7919be94f42bdff19be
parentc7d6970864065665f51f366a4589443fb564365f (diff)
downloadorg-mode-e1a01d50776d5c224fc27faf51369aeadb361fa4.zip
org-mode-e1a01d50776d5c224fc27faf51369aeadb361fa4.tar.gz
org.el: Fix references to org-install.el.
* org.el ("org-loaddefs.el"): Don't throw an error if the file cannot be fund. (org-version): Use org-loaddefs.el instead of org-install.el.
-rw-r--r--lisp/org.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 723cf3a..935b586 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -78,7 +78,7 @@
(require 'find-func)
(require 'format-spec)
-(load "org-loaddefs.el" nil t)
+(load "org-loaddefs.el" t t)
;; `org-outline-regexp' ought to be a defconst but is let-binding in
;; some places -- e.g. see the macro org-with-limited-levels.
@@ -232,7 +232,7 @@ When FULL is non-nil, use a verbose version string.
When MESSAGE is non-nil, display a message with the version."
(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-install-dir (ignore-errors (org-find-library-dir "org-loaddefs.el")))
(org-trash (or
(and (fboundp 'org-release) (fboundp 'org-git-version))
(load (concat org-dir "org-version.el")
@@ -246,7 +246,7 @@ When MESSAGE is non-nil, display a message with the version."
(if (string= org-dir org-install-dir)
org-install-dir
(concat "mixed installation! " org-install-dir " and " org-dir))
- "org-install.el can not be found!")))
+ "org-loaddefs.el can not be found!")))
(_version (if full version org-version)))
(if (org-called-interactively-p 'interactive)
(if here