From: AndreaCorallo <akrl@sdf.org>
Date: Tue, 3 Mar 2020 22:06:08 +0000 (+0000)
Subject: Fix org for eln new compilation folder layout
X-Git-Tag: emacs-28.0.90~2727^2~796
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f77f6ca77054ca6122df2742345710b7493ad293;p=emacs.git

Fix org for eln new compilation folder layout
---

diff --git a/lisp/org/org.el b/lisp/org/org.el
index f1a7f61a9a1..a9303e880b8 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.")