Backport commit b34d39170 from Emacs

* lisp/org.el: Don't require easymenu in Emacs 28 or later.

Minor fixes after preloading easymenu
b34d39170b67a7a285f7c8c2ea1b4128b531aad9
Stefan Kangas
Sat Feb 27 20:04:41 2021 +0100
This commit is contained in:
Stefan Kangas 2021-02-27 18:43:20 +01:00 committed by Kyle Meyer
parent f9a414eb83
commit 7922d161c0
1 changed files with 2 additions and 1 deletions

View File

@ -4757,7 +4757,8 @@ This is for getting out of special buffers like capture.")
;; Other stuff we need.
(require 'time-date)
(unless (fboundp 'time-subtract) (defalias 'time-subtract 'subtract-time))
(require 'easymenu)
(when (< emacs-major-version 28) ; preloaded in Emacs 28
(require 'easymenu))
(require 'org-entities)
(require 'org-faces)