[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp c8b7e07 2/3: Revert "Fix org for eln new compilation
From: |
Andrea Corallo |
Subject: |
feature/native-comp c8b7e07 2/3: Revert "Fix org for eln new compilation folder layout" |
Date: |
Mon, 13 Apr 2020 05:57:31 -0400 (EDT) |
branch: feature/native-comp
commit c8b7e07553a77d9c57e2022a06c651513109ea5d
Author: Andrea Corallo <address@hidden>
Commit: Andrea Corallo <address@hidden>
Revert "Fix org for eln new compilation folder layout"
This reverts commit f77f6ca77054ca6122df2742345710b7493ad293.
---
lisp/org/org.el | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index a9303e8..f1a7f61 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -78,10 +78,8 @@
(or (eq this-command 'eval-buffer)
(condition-case nil
- (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)))
+ (load (concat (file-name-directory load-file-name)
+ "org-loaddefs.el")
nil t t t)
(error
(message "WARNING: No org-loaddefs.el file could be found from where
org.el is loaded.")