From: Glenn Morris <rgm@gnu.org>
Date: Fri, 29 Oct 2021 16:20:05 +0000 (-0700)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~3671^2~358
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=af22a0a083304b898edf82a2c8a3d06f8a71eab7;p=emacs.git

Merge from origin/emacs-28

f52fa1c150 image-dired: Unreverse accidentally reversed menus

# Conflicts:
#	lisp/image-dired.el
---

af22a0a083304b898edf82a2c8a3d06f8a71eab7
diff --cc lisp/image-dired.el
index 53bead350ce,329085c823c..4a9e1d44fa0
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@@ -1665,32 -1547,33 +1665,34 @@@ You probably want to use this together 
      (easy-menu-define nil map
        "Menu for `image-dired-thumbnail-mode'."
        '("Image-Dired"
-         ["Quit" quit-window]
-         ["Delete thumbnail from buffer" image-dired-delete-char]
-         ["Delete marked images" image-dired-delete-marked]
-         ["Unmark all marks" image-dired-unmark-all-marks]
-         ["Remove tag from current or marked thumbnails"
-          image-dired-tag-thumbnail-remove]
-         ["Tag current or marked thumbnails" image-dired-tag-thumbnail]
-         ["Comment thumbnail" image-dired-comment-thumbnail]
-         ["Refresh thumb" image-dired-refresh-thumb]
-         ["Dynamic line up" image-dired-line-up-dynamic]
-         ["Line up thumbnails" image-dired-line-up]
- 
-         ["Rotate original left" image-dired-rotate-original-left]
-         ["Rotate original right" image-dired-rotate-original-right]
+         ["Display image" image-dired-display-thumbnail-original-image]
+         ["Display in external viewer" image-dired-thumbnail-display-external]
  
-         ["Toggle movement tracking on/off" image-dired-toggle-movement-tracking]
+         ["Mark original" image-dired-mark-thumb-original-file]
+         ["Unmark original" image-dired-unmark-thumb-original-file]
+         ["Flag original for deletion" image-dired-flag-thumb-original-file]
  
-         ["Jump to dired buffer" image-dired-jump-original-dired-buffer]
          ["Track original" image-dired-track-original-file]
+         ["Jump to dired buffer" image-dired-jump-original-dired-buffer]
  
-         ["Flag original for deletion" image-dired-flag-thumb-original-file]
-         ["Unmark original" image-dired-unmark-thumb-original-file]
-         ["Mark original" image-dired-mark-thumb-original-file]
+         ["Toggle movement tracking on/off" image-dired-toggle-movement-tracking]
  
-         ["Display in external viewer" image-dired-thumbnail-display-external]
-         ["Display image" image-dired-display-thumbnail-original-image]))
+         ["Rotate original right" image-dired-rotate-original-right]
+         ["Rotate original left" image-dired-rotate-original-left]
+         ["Rotate thumbnail right" image-dired-rotate-thumbnail-right]
+         ["Rotate thumbnail left" image-dired-rotate-thumbnail-left]
+ 
+         ["Line up thumbnails" image-dired-line-up]
+         ["Dynamic line up" image-dired-line-up-dynamic]
+         ["Refresh thumb" image-dired-refresh-thumb]
+         ["Comment thumbnail" image-dired-comment-thumbnail]
+         ["Tag current or marked thumbnails" image-dired-tag-thumbnail]
+         ["Remove tag from current or marked thumbnails"
+          image-dired-tag-thumbnail-remove]
++        ["Unmark all marks" image-dired-unmark-all-marks]
+         ["Delete marked images" image-dired-delete-marked]
+         ["Delete thumbnail from buffer" image-dired-delete-char]
+         ["Quit" quit-window]))
      map)
    "Keymap for `image-dired-thumbnail-mode'.")