From 3a0a0d616ecb13eece6c0f07c779d7f094836174 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Sat, 24 Sep 2022 18:27:35 +0200
Subject: [PATCH] image-dired: Move menu definitions to keymaps

* lisp/image/image-dired.el (image-dired-thumbnail-mode-menu):
* lisp/image/image-dired-dired.el (image-dired-minor-mode-menu):
Delete variables and move menus to...
* lisp/image/image-dired.el (image-dired-thumbnail-mode-map):
* lisp/image/image-dired-dired.el(image-dired-minor-mode-map):
...here.
---
 lisp/image/image-dired-dired.el | 7 +++----
 lisp/image/image-dired.el       | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lisp/image/image-dired-dired.el b/lisp/image/image-dired-dired.el
index d4574ca0bc2..3c9e0c5b3fc 100644
--- a/lisp/image/image-dired-dired.el
+++ b/lisp/image/image-dired-dired.el
@@ -206,11 +206,10 @@ With prefix argument, move ARG lines."
   "C-S-n"  #'image-dired-next-line-and-display
   "C-S-p"  #'image-dired-previous-line-and-display
   "C-S-m"  #'image-dired-mark-and-display-next
-  "<tab>"  #'image-dired-jump-thumbnail-buffer)
+  "<tab>"  #'image-dired-jump-thumbnail-buffer
 
-(easy-menu-define image-dired-minor-mode-menu image-dired-minor-mode-map
-  "Menu for `image-dired-minor-mode'."
-  '("Image-dired"
+  :menu
+  '("Image-Dired"
     ["Display thumb for next file" image-dired-next-line-and-display]
     ["Display thumb for previous file" image-dired-previous-line-and-display]
     ["Mark and display next" image-dired-mark-and-display-next]
diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el
index dd434ce6ffb..05bd827557c 100644
--- a/lisp/image/image-dired.el
+++ b/lisp/image/image-dired.el
@@ -890,10 +890,9 @@ You probably want to use this together with
   "<remap> <beginning-of-buffer>"    #'image-dired-beginning-of-buffer
   "<remap> <end-of-buffer>"          #'image-dired-end-of-buffer
   "<remap> <move-beginning-of-line>" #'image-dired-move-beginning-of-line
-  "<remap> <move-end-of-line>"       #'image-dired-move-end-of-line)
+  "<remap> <move-end-of-line>"       #'image-dired-move-end-of-line
 
-(easy-menu-define image-dired-thumbnail-mode-menu image-dired-thumbnail-mode-map
-  "Menu for `image-dired-thumbnail-mode'."
+  :menu
   '("Image-Dired"
     ["Display image" image-dired-display-thumbnail-original-image]
     ["Display in external viewer" image-dired-thumbnail-display-external]
-- 
2.39.2