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.

diff --git a/etc/NEWS b/etc/NEWS
index cb307675d19641caf32847b54cfe3c35b30666be..1e950b87dcbe13d40aa6c34152ea2fd8dbe4da59 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2387,6 +2387,9 @@ This can be used to control whether the defined mode is a command
 or not, and is useful when defining commands that aren't meant to be
 used by users directly.
 
+---
+** The 'easymenu' library is now preloaded.
+
 ** The 'values' variable is now obsolete.
 
 ---

diff --git a/lisp/cedet/ede/dired.el b/lisp/cedet/ede/dired.el
index 7eb42ed9de8958afd4f5a3b1762ed83a04718c85..8b9eae0b4307018cae1c63ce41a5efa5583f7329 100644 (file)
--- a/lisp/cedet/ede/dired.el
+++ b/lisp/cedet/ede/dired.el
@@ -30,7 +30,6 @@
 
 ;;; Code:
 
-(require 'easymenu)
 (require 'dired)
 (require 'ede)
 

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 1199de183fb4a028383211dae838e160ca1b15cf..5f31bc402ff93111c684ea9d63ed3fce549214ca 100644 (file)
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -236,8 +236,6 @@ to nil: a pipe using `zcat' or `gunzip -c' will be used."
 
 ;;; MENU BINDINGS
 
-(require 'easymenu)
-
 (when-let ((menu (lookup-key dired-mode-map [menu-bar])))
   (easy-menu-add-item menu '("Operate")
                       ["Find Files" dired-do-find-marked-files

diff --git a/lisp/filesets.el b/lisp/filesets.el
index 2ef13ae832050cbbd7b9e74a80577c7a13aee5d1..a51b6f81358d1cb72ca83c2d085dbf7caa37ced6 100644 (file)
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -90,7 +90,6 @@
 
 (require 'cl-lib)
 (require 'seq)
-(require 'easymenu)
 
 ;;; Some variables
 

diff --git a/lisp/follow.el b/lisp/follow.el
index 069758747c19f194072f70052e724702f2a45584..42e3b60ec424b80b45eed8977be1af2e1ff0a56a 100644 (file)
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -201,7 +201,6 @@
 
 ;;; Code:
 
-(require 'easymenu)
 (eval-when-compile (require 'cl-lib))
 
 ;;; Variables

diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 9a22256113c277b81c7b718a4f13d05eabceaea9..e3b9c196186ad0d0097d2f8abe21f8f9bd611c7e 100644 (file)
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -88,7 +88,6 @@
 (require 'gnus-art)
 (require 'gnus-util)
 (require 'nnmail)
-(require 'easymenu)
 (require 'registry)
 
 (defvar gnus-adaptive-word-syntax-table)

diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index afdf7c9a43947975b838ce37d7b2ed9af69ebc1b..4f048045d52ed682626fc06d8e6b1cdd6083f0bd 100644 (file)
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -1052,8 +1052,6 @@ queries the server for the existing fields and displays a corresponding form."
 
 ;;{{{      Menus and keymaps
 
-(require 'easymenu)
-
 (defconst eudc-custom-generated-menu (cdr (custom-menu-create 'eudc)))
 
 (defconst eudc-tail-menu

diff --git a/lisp/org/org.el b/lisp/org/org.el
index fcf02f1329984f3f0968633d82e412a56f356b49..41898dc20280658ede26928b722c3f571b07ca66 100644 (file)
--- 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)

diff --git a/lisp/printing.el b/lisp/printing.el
index 2f234b7b052a510893c7bed4a5755b0f3ae22a81..f6b9494e1776633e7cc7b99b5ce7e2c72e2f7bb6 100644 (file)
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -1014,7 +1014,6 @@ Please send all bug fixes and enhancements to
 
 (require 'lpr)
 (require 'ps-print)
-(require 'easymenu)
 
 (and (string< ps-print-version "6.6.4")
      (error "`printing' requires `ps-print' package version 6.6.4 or later"))

diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index d569bf898c9d535e094cb1a4833818afaa6b4399..8a1d441773a28e80c5fe93b5b751ced0574cbec9 100644 (file)
--- 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

diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index c4de800e33203a41d40c6c18d506ebacbde38882..c8e55da642fea8baa78b8164d8710b0921c85acb 100644 (file)
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -2159,7 +2159,8 @@ your style, only those that are different from the default.")
 
 ;; mandatory
 (require 'compile)                     ; XEmacs
-(require 'easymenu)
+(when (< emacs-major-version 28)       ; preloaded in Emacs 28
+  (require 'easymenu))
 (require 'hippie-exp)
 
 ;; optional (minimize warning messages during compile)

diff --git a/lisp/recentf.el b/lisp/recentf.el
index d39a523289fa7cd6cae30ff85232f4dcba7c4b08..48b8e2b671905cf972e18876e16430b3b33fc6d9 100644 (file)
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -37,7 +37,6 @@
 ;;
 
 ;;; Code:
-(require 'easymenu)
 (require 'tree-widget)
 (require 'timer)
 

diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index d64c72184eaac0a7e0698cc4fb6d0a6d14cb1ea8..0e2a3749bef7db9dd9d75ac24cda8f1809f66fce 100644 (file)
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -106,7 +106,6 @@
 ;;; TODO:
 ;; - Timeout directories we haven't visited in a while.
 
-(require 'easymenu)
 (require 'dframe)
 (require 'ezimage)
 

diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index be9b23677cb011499984398722629d9987e9bf60..269d676c2bc1cb5919a982bb85266736915b70db 100644 (file)
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -51,7 +51,8 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl-lib))
-(require 'easymenu)
+(when (< emacs-major-version 28)  ; preloaded in Emacs 28
+  (require 'easymenu))
 
 (defvar reftex-tables-dirty t
   "Flag showing if tables need to be re-computed.")