Skip to content

Commit

Permalink
lisp/org.el: Do not skip loading org-loaddefs when using `eval-buffer'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Ihor Radchenko authored and bzg committed Sep 25, 2022
1 parent fd19526 commit 235c72e
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions lisp/org.el
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 235c72e

Please sign in to comment.