feature/native-comp f77f6ca 08/11: Fix org for eln new compilation folder layout

[Andrea Corallo]

branch: feature/native-comp
commit f77f6ca77054ca6122df2742345710b7493ad293
Author: AndreaCorallo <address@hidden>
Commit: Andrea Corallo <address@hidden>

    Fix org for eln new compilation folder layout
---
 lisp/org/org.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/org/org.el b/lisp/org/org.el
index f1a7f61..a9303e8 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -78,8 +78,10 @@
 
 (or (eq this-command 'eval-buffer)
     (condition-case nil
-       (load (concat (file-name-directory load-file-name)
-                     "org-loaddefs.el")
+       (load (expand-file-name "org-loaddefs.el"
+         (if (string-match "[.]eln$" load-file-name)
+            (concat (file-name-directory load-file-name) "..")
+         (file-name-directory load-file-name)))
              nil t t t)
       (error
        (message "WARNING: No org-loaddefs.el file could be found from where 
org.el is loaded.")