[elpa] externals/org 7922d16 5/6: Backport commit b34d39170 from Emacs

[ELPA Syncer]

branch: externals/org
commit 7922d161c02cf83269d3b7647a0b18fcee24b37e
Author: Stefan Kangas <stefan@marxist.se>
Commit: Kyle Meyer <kyle@kyleam.com>

    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
---
 lisp/org.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index fcf02f1..41898dc 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -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)