mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

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.
This commit is contained in:
Bastien Guerry 2012-10-02 12:18:51 +02:00
parent c7d6970864
commit e1a01d5077
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/org.el
View File

@ -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