diff options
author | Stefan Kangas <stefan@marxist.se> | 2021-02-26 15:50:41 +0100 |
---|---|---|
committer | Stefan Kangas <stefan@marxist.se> | 2021-02-26 15:52:26 +0100 |
commit | 54af0d4298fbd60692a7b5339b5b909242909bf4 (patch) | |
tree | ac46e4d45a58b3c9cfdfd78a043c299fd4c29897 | |
parent | f83775b4d34f48b44481bc1f4f9e78a83556c2f1 (diff) | |
download | emacs-54af0d4298fbd60692a7b5339b5b909242909bf4.tar.gz emacs-54af0d4298fbd60692a7b5339b5b909242909bf4.tar.bz2 emacs-54af0d4298fbd60692a7b5339b5b909242909bf4.zip |
Remove redundant requires of easymenu
* lisp/allout.el:
* lisp/emacs-lisp/edebug.el:
* lisp/emacs-lisp/ert.el:
* lisp/erc/erc-menu.el:
* lisp/help-mode.el:
* lisp/net/dictionary.el:
* lisp/nxml/rng-nxml.el:
* lisp/progmodes/ebrowse.el:
* lisp/progmodes/meta-mode.el:
* lisp/progmodes/prolog.el:
* lisp/progmodes/ps-mode.el:
* lisp/progmodes/vera-mode.el:
* lisp/wid-browse.el: Remove redundant require of easymenu. We only
use the autoloaded macro 'easy-menu-define' here.
-rw-r--r-- | lisp/allout.el | 1 | ||||
-rw-r--r-- | lisp/emacs-lisp/edebug.el | 4 | ||||
-rw-r--r-- | lisp/emacs-lisp/ert.el | 1 | ||||
-rw-r--r-- | lisp/erc/erc-menu.el | 1 | ||||
-rw-r--r-- | lisp/help-mode.el | 1 | ||||
-rw-r--r-- | lisp/net/dictionary.el | 1 | ||||
-rw-r--r-- | lisp/nxml/rng-nxml.el | 1 | ||||
-rw-r--r-- | lisp/progmodes/ebrowse.el | 1 | ||||
-rw-r--r-- | lisp/progmodes/meta-mode.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/prolog.el | 1 | ||||
-rw-r--r-- | lisp/progmodes/ps-mode.el | 1 | ||||
-rw-r--r-- | lisp/progmodes/vera-mode.el | 2 | ||||
-rw-r--r-- | lisp/wid-browse.el | 1 |
13 files changed, 0 insertions, 18 deletions
diff --git a/lisp/allout.el b/lisp/allout.el index ff0b67556e0..7fcf41c4304 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -1206,7 +1206,6 @@ Also refresh various data structures that hinge on the regexp." (defvar allout-mode-navigation-menu) (defvar allout-mode-misc-menu) (defun allout-produce-mode-menubar-entries () - (require 'easymenu) (easy-menu-define allout-mode-exposure-menu allout-mode-map-value "Allout outline exposure menu." diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 45e76c751fe..6f3c7d66881 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -4369,10 +4369,6 @@ It is removed when you hit any char." (set variable (not (symbol-value variable))) (message "%s: %s" variable (symbol-value variable))) -;; We have to require easymenu (even for Emacs 18) just so -;; the easy-menu-define macro call is compiled correctly. -(require 'easymenu) - (defconst edebug-mode-menus '("Edebug" ["Stop" edebug-stop t] diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index 96c1a02dbcc..a5c877e53ad 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -60,7 +60,6 @@ (require 'cl-lib) (require 'debug) (require 'backtrace) -(require 'easymenu) (require 'ewoc) (require 'find-func) (require 'pp) diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el index 3995a0564af..0e334e93bd9 100644 --- a/lisp/erc/erc-menu.el +++ b/lisp/erc/erc-menu.el @@ -28,7 +28,6 @@ ;;; Code: (require 'erc) -(require 'easymenu) (defgroup erc-menu nil "ERC menu support." diff --git a/lisp/help-mode.el b/lisp/help-mode.el index 6fd3d40fe3c..e6a5fe8a80e 100644 --- a/lisp/help-mode.el +++ b/lisp/help-mode.el @@ -30,7 +30,6 @@ ;;; Code: (require 'cl-lib) -(eval-when-compile (require 'easymenu)) (defvar help-mode-map (let ((map (make-sparse-keymap))) diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el index c6af4e66e39..aba3698a533 100644 --- a/lisp/net/dictionary.el +++ b/lisp/net/dictionary.el @@ -35,7 +35,6 @@ ;;; Code: (require 'cl-lib) -(require 'easymenu) (require 'custom) (require 'dictionary-connection) (require 'button) diff --git a/lisp/nxml/rng-nxml.el b/lisp/nxml/rng-nxml.el index 7d74fd3c8a7..7ea6fb2e49d 100644 --- a/lisp/nxml/rng-nxml.el +++ b/lisp/nxml/rng-nxml.el @@ -24,7 +24,6 @@ ;;; Code: -(require 'easymenu) (require 'xmltok) (require 'nxml-util) (require 'nxml-ns) diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el index a174d4851e5..40bdaad574f 100644 --- a/lisp/progmodes/ebrowse.el +++ b/lisp/progmodes/ebrowse.el @@ -35,7 +35,6 @@ (require 'cl-lib) (require 'seq) -(require 'easymenu) (require 'view) (require 'ebuff-menu) diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index 46b0949c133..a59014827e8 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el @@ -88,8 +88,6 @@ ;;; Code: -(require 'easymenu) - (defgroup meta-font nil "Major mode for editing Metafont or MetaPost sources." :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces) diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 9f5f9ed6d3d..29cce51e222 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -267,7 +267,6 @@ (require 'shell) ) -(require 'easymenu) (require 'align) (defgroup prolog nil diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el index 15fd2e84393..598f748f5b3 100644 --- a/lisp/progmodes/ps-mode.el +++ b/lisp/progmodes/ps-mode.el @@ -39,7 +39,6 @@ "Peter Kleiweg <p.c.j.kleiweg@rug.nl>, bug-gnu-emacs@gnu.org") (require 'comint) -(require 'easymenu) (require 'smie) ;; Define core `PostScript' group. diff --git a/lisp/progmodes/vera-mode.el b/lisp/progmodes/vera-mode.el index c2e1719d54a..036b2f447bf 100644 --- a/lisp/progmodes/vera-mode.el +++ b/lisp/progmodes/vera-mode.el @@ -119,8 +119,6 @@ If nil, TAB always indents current line." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Menu -(require 'easymenu) - (easy-menu-define vera-mode-menu vera-mode-map "Menu keymap for Vera Mode." '("Vera" diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el index 124cb04486c..39b32217628 100644 --- a/lisp/wid-browse.el +++ b/lisp/wid-browse.el @@ -27,7 +27,6 @@ ;;; Code: -(require 'easymenu) (require 'wid-edit) (defgroup widget-browse nil |