mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-03 08:30:09 +00:00
Code Issues Releases Activity

Merge from origin/emacs-28

Browse Source 
f52fa1c150 image-dired: Unreverse accidentally reversed menus

# Conflicts:
#	lisp/image-dired.el
This commit is contained in:
Glenn Morris 2021-10-29 09:20:05 -07:00
commit af22a0a083
1 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
lisp/image-dired.el
View File

@ -1665,32 +1665,34 @@ You probably want to use this together with
(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]
["Display image" image-dired-display-thumbnail-original-image]
["Display in external viewer" image-dired-thumbnail-display-external]
["Rotate original left" image-dired-rotate-original-left]
["Rotate original right" image-dired-rotate-original-right]
["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]
["Track original" image-dired-track-original-file]
["Jump to dired buffer" image-dired-jump-original-dired-buffer]
["Toggle movement tracking on/off" image-dired-toggle-movement-tracking]
["Jump to dired buffer" image-dired-jump-original-dired-buffer]
["Track original" image-dired-track-original-file]
["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]
["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]
["Display in external viewer" image-dired-thumbnail-display-external]
["Display image" image-dired-display-thumbnail-original-image]))
["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'.")
@ -1723,9 +1725,9 @@ You probably want to use this together with
(easy-menu-define nil map
"Menu for `image-dired-display-image-mode-map'."
'("Image-Dired"
["Quit" quit-window]
["Display original, full size" image-dired-display-current-image-full]
["Display original, sized to fit" image-dired-display-current-image-sized]
["Display original, full size" image-dired-display-current-image-full]))
["Quit" quit-window]))
map)
"Keymap for `image-dired-display-image-mode'.")
@ -1795,25 +1797,25 @@ Resized or in full-size."
(easy-menu-define nil map
"Menu for `image-dired-minor-mode'."
'("Image-dired"
["Copy with EXIF file name" image-dired-copy-with-exif-file-name]
["Comment files" image-dired-dired-comment-files]
["Mark tagged files" image-dired-mark-tagged-files]
["Jump to thumbnail buffer" image-dired-jump-thumbnail-buffer]
["Toggle movement tracking" image-dired-toggle-movement-tracking]
["Toggle append browsing" image-dired-toggle-append-browsing]
["Toggle display properties" image-dired-toggle-dired-display-properties]
["Display in external viewer" image-dired-dired-display-external]
["Display image" image-dired-dired-display-image]
["Display this thumbnail" image-dired-display-thumb]
["Display thumbnails append" image-dired-display-thumbs-append]
["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]
["Create thumbnails for marked files" image-dired-create-thumbs]
["Mark and display next" image-dired-mark-and-display-next]
["Display thumb for previous file" image-dired-previous-line-and-display]
["Display thumb for next file" image-dired-next-line-and-display]))
["Display thumbnails append" image-dired-display-thumbs-append]
["Display this thumbnail" image-dired-display-thumb]
["Display image" image-dired-dired-display-image]
["Display in external viewer" image-dired-dired-display-external]
["Toggle display properties" image-dired-toggle-dired-display-properties]
["Toggle append browsing" image-dired-toggle-append-browsing]
["Toggle movement tracking" image-dired-toggle-movement-tracking]
["Jump to thumbnail buffer" image-dired-jump-thumbnail-buffer]
["Mark tagged files" image-dired-mark-tagged-files]
["Comment files" image-dired-dired-comment-files]
["Copy with EXIF file name" image-dired-copy-with-exif-file-name]))
map)
"Keymap for `image-dired-minor-mode'.")