From b34d39170b67a7a285f7c8c2ea1b4128b531aad9 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Sat, 27 Feb 2021 18:43:20 +0100
Subject: 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.
---
 lisp/progmodes/antlr-mode.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lisp/progmodes/antlr-mode.el')

diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index d569bf898c9..8a1d441773a 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -84,7 +84,8 @@
 
 (eval-when-compile (require 'cl-lib))
 
-(require 'easymenu)
+(when (< emacs-major-version 28)  ; preloaded in Emacs 28
+  (require 'easymenu))
 (require 'cc-mode)
 
 ;; More compile-time-macros
-- 
cgit v1.2.3