[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 3b0c4ad207 2/2: lisp/org.el: Do not skip loading or
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org 3b0c4ad207 2/2: lisp/org.el: Do not skip loading org-loaddefs when using `eval-buffer' |
Date: |
Sat, 24 Sep 2022 23:57:49 -0400 (EDT) |
branch: externals/org
commit 3b0c4ad20794ecfb6557900897179718cc812786
Author: Ihor Radchenko <yantar92@gmail.com>
Commit: Ihor Radchenko <yantar92@gmail.com>
lisp/org.el: Do not skip loading org-loaddefs when using `eval-buffer'
* lisp/org.e: Do not skip loading "org-loaddefs.el" when Org mode is
loaded through M-x eval-buffer.
Fixes https://orgmode.org/list/874jwyalo1.fsf@localhost
---
lisp/org.el | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 0009224f9e..b63aaed4f0 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -82,16 +82,15 @@
(require 'find-func)
(require 'format-spec)
-(or (eq this-command 'eval-buffer)
- (condition-case nil
- (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.")
- (sit-for 3)
- (message "You need to run \"make\" or \"make autoloads\" from Org lisp
directory")
- (sit-for 3))))
+(condition-case nil
+ (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.")
+ (sit-for 3)
+ (message "You need to run \"make\" or \"make autoloads\" from Org lisp
directory")
+ (sit-for 3)))
(eval-and-compile (require 'org-macs))
(require 'org-compat)