Improve documentation of image-related commands

* lisp/image.el (image-map): Make it inherit from
'image-slice-map' instead of repeating the bindings.

* doc/emacs/files.texi (Image Mode): Document the key bindings set
by 'insert-image'.  Add indexing.

* doc/lispref/display.texi (Showing Images): Make the description
of user commands more concise.  Add index entries and
cross-reference to the Emacs manual.

* etc/NEWS: Rearrange entries relevant to image commands.

1 files changed, 8 insertions, 16 deletions

diff --git a/lisp/image.el b/lisp/image.el
index 818679a4d7b..6a8293fedf3 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -172,22 +172,6 @@ or \"ffmpeg\") is installed."
 
 (define-error 'unknown-image-type "Unknown image type")
 
-(defvar-keymap image-map
-  :doc "Map put into text properties on images."
-  "i" (define-keymap
-        "-" #'image-decrease-size
-        "+" #'image-increase-size
-        "r" #'image-rotate
-        "o" #'image-save
-        "c" #'image-crop
-        "x" #'image-cut
-        "h" #'image-flip-horizontally
-        "v" #'image-flip-vertically)
-  "C-<wheel-down>" #'image-mouse-decrease-size
-  "C-<mouse-5>"    #'image-mouse-decrease-size
-  "C-<wheel-up>"   #'image-mouse-increase-size
-  "C-<mouse-4>"    #'image-mouse-increase-size)
-
 (defvar-keymap image-slice-map
   :doc "Map put into text properties on sliced images."
   "i" (define-keymap
@@ -201,6 +185,14 @@ or \"ffmpeg\") is installed."
   "C-<wheel-up>"   #'image-mouse-increase-size
   "C-<mouse-4>"    #'image-mouse-increase-size)
 
+(defvar-keymap image-map
+  :doc "Map put into text properties on images."
+  :parent image-slice-map
+  "i" (define-keymap
+        "r" #'image-rotate
+        "h" #'image-flip-horizontally
+        "v" #'image-flip-vertically))
+
 (defun image-load-path-for-library (library image &optional path no-error)
   "Return a suitable search path for images used by LIBRARY.