diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-02-27 18:43:20 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-02-27 20:04:41 +0100 |
| commit | b34d39170b67a7a285f7c8c2ea1b4128b531aad9 (patch) | |
| tree | 585330febb8b0a65f9079a95f9f26e94b311db13 /lisp/org/org.el | |
| parent | a4d7235f1a22701f53d3ea9eb6a9da3cbe0cb46a (diff) | |
| download | emacs-b34d39170b67a7a285f7c8c2ea1b4128b531aad9.tar.gz emacs-b34d39170b67a7a285f7c8c2ea1b4128b531aad9.tar.bz2 emacs-b34d39170b67a7a285f7c8c2ea1b4128b531aad9.zip | |
Minor fixes after preloading easymenu
* lisp/cedet/ede/dired.el:
* lisp/dired-x.el:
* lisp/filesets.el:
* lisp/follow.el:
* lisp/gnus/gnus-registry.el:
* lisp/net/eudc.el:
* lisp/printing.el:
* lisp/recentf.el:
* lisp/speedbar.el: Remove redundant require of easymenu; it is now
preloaded.
* lisp/org/org.el:
* lisp/progmodes/antlr-mode.el:
* lisp/progmodes/vhdl-mode.el:
* lisp/textmodes/reftex.el: Don't require easymenu in Emacs 28 or
later.
* etc/NEWS: Announce that 'easymenu' is now preloaded.
Diffstat (limited to 'lisp/org/org.el')
| -rw-r--r-- | lisp/org/org.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org/org.el b/lisp/org/org.el index fcf02f13299..41898dc2028 100644 --- a/lisp/org/org.el +++ b/lisp/org/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) |