summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2020-11-19 02:39:09 +0100
committerStefan Kangas <stefan@marxist.se>2020-11-19 02:58:25 +0100
commit0e075c9f913d6235637e080f71f59a26c5be6b7b (patch)
treeae78efc28979956ddc5974a3a4de8694f33442ae /lisp
parentb5f3a04f47a7542a39b18bf6026cbb7f01cab5dd (diff)
downloademacs-0e075c9f913d6235637e080f71f59a26c5be6b7b.tar.gz
emacs-0e075c9f913d6235637e080f71f59a26c5be6b7b.tar.bz2
emacs-0e075c9f913d6235637e080f71f59a26c5be6b7b.zip
Remove unnecessary load from idlwave
* lisp/progmodes/idlw-shell.el: * lisp/progmodes/idlwave.el: Remove unnecessary load; easy-menu-define is autoloaded.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/progmodes/idlw-shell.el28
-rw-r--r--lisp/progmodes/idlwave.el14
2 files changed, 19 insertions, 23 deletions
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 38127fccbc3..efc51ec32c3 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -4352,21 +4352,19 @@ Shell debugging commands are available as single key sequences."
["Toggle Toolbar" idlwave-shell-toggle-toolbar t]
["Exit IDL" idlwave-shell-quit t]))
-(if (or (featurep 'easymenu) (load "easymenu" t))
- (progn
- (easy-menu-define
- idlwave-mode-debug-menu idlwave-mode-map "IDL debugging menus"
- idlwave-shell-menu-def)
- (easy-menu-define
- idlwave-shell-mode-menu idlwave-shell-mode-map "IDL shell menus"
- idlwave-shell-menu-def)
- (save-current-buffer
- (dolist (buf (buffer-list))
- (set-buffer buf)
- (if (derived-mode-p 'idlwave-mode)
- (progn
- (easy-menu-remove idlwave-mode-debug-menu)
- (easy-menu-add idlwave-mode-debug-menu)))))))
+(easy-menu-define
+ idlwave-mode-debug-menu idlwave-mode-map "IDL debugging menus"
+ idlwave-shell-menu-def)
+(easy-menu-define
+ idlwave-shell-mode-menu idlwave-shell-mode-map "IDL shell menus"
+ idlwave-shell-menu-def)
+(save-current-buffer
+ (dolist (buf (buffer-list))
+ (set-buffer buf)
+ (if (derived-mode-p 'idlwave-mode)
+ (progn
+ (easy-menu-remove idlwave-mode-debug-menu)
+ (easy-menu-add idlwave-mode-debug-menu)))))
;; The Breakpoint Glyph -------------------------------------------------------
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 86f9f336723..1cb54d6324e 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -9032,14 +9032,12 @@ Assumes that point is at the beginning of the unit as found by
(and (boundp 'idlwave-shell-automatic-start)
idlwave-shell-automatic-start)]))
-(if (or (featurep 'easymenu) (load "easymenu" t))
- (progn
- (easy-menu-define idlwave-mode-menu idlwave-mode-map
- "IDL and WAVE CL editing menu"
- idlwave-mode-menu-def)
- (easy-menu-define idlwave-mode-debug-menu idlwave-mode-map
- "IDL and WAVE CL editing menu"
- idlwave-mode-debug-menu-def)))
+(easy-menu-define idlwave-mode-menu idlwave-mode-map
+ "IDL and WAVE CL editing menu"
+ idlwave-mode-menu-def)
+(easy-menu-define idlwave-mode-debug-menu idlwave-mode-map
+ "IDL and WAVE CL editing menu"
+ idlwave-mode-debug-menu-def)
(defun idlwave-customize ()
"Call the customize function with `idlwave' as argument."