Change doc-view-mode-map prefix key 's' to 'c'.

* doc/emacs/misc.texi (DocView Slicing): Change prefix key 's' to 'c'.

* lisp/doc-view.el (doc-view-mode-map): Change prefix key 's' to 'c'.

* lisp/image-mode.el (image-mode-map): Add image-transform-set-scale to menu.

* doc/emacs/files.texi (Image Mode): Describe commands
image-transform-fit-both, image-transform-set-scale, image-transform-reset.

* etc/NEWS: Rearrange image sections.

https://lists.gnu.org/archive/html/emacs-devel/2020-04/msg01315.html

2 files changed, 12 insertions, 10 deletions

diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 8dd0d93071e..714fdf8b088 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -59,16 +59,16 @@
 ;; will be remembered and applied to all pages of the current
 ;; document.  This enables you to cut away the margins of a document
 ;; to save some space.  To select a slice you can use
-;; `doc-view-set-slice' (bound to `s s') which will query you for the
+;; `doc-view-set-slice' (bound to `c s') which will query you for the
 ;; coordinates of the slice's top-left corner and its width and
 ;; height.  A much more convenient way to do the same is offered by
-;; the command `doc-view-set-slice-using-mouse' (bound to `s m').
+;; the command `doc-view-set-slice-using-mouse' (bound to `c m').
 ;; After invocation you only have to press mouse-1 at the top-left
 ;; corner and drag it to the bottom-right corner of the desired slice.
 ;; Even more accurate and convenient is to use
-;; `doc-view-set-slice-from-bounding-box' (bound to `s b') which uses
+;; `doc-view-set-slice-from-bounding-box' (bound to `c b') which uses
 ;; the BoundingBox information of the current page to set an optimal
-;; slice.  To reset the slice use `doc-view-reset-slice' (bound to `s
+;; slice.  To reset the slice use `doc-view-reset-slice' (bound to `c
 ;; r').
 ;;
 ;; You can also search within the document.  The command `doc-view-search'
@@ -433,10 +433,10 @@ Typically \"page-%s.png\".")
     ;; Killing the buffer (and the process)
     (define-key map (kbd "K")         'doc-view-kill-proc)
     ;; Slicing the image
-    (define-key map (kbd "s s")       'doc-view-set-slice)
-    (define-key map (kbd "s m")       'doc-view-set-slice-using-mouse)
-    (define-key map (kbd "s b")       'doc-view-set-slice-from-bounding-box)
-    (define-key map (kbd "s r")       'doc-view-reset-slice)
+    (define-key map (kbd "c s")       'doc-view-set-slice)
+    (define-key map (kbd "c m")       'doc-view-set-slice-using-mouse)
+    (define-key map (kbd "c b")       'doc-view-set-slice-from-bounding-box)
+    (define-key map (kbd "c r")       'doc-view-reset-slice)
     ;; Searching
     (define-key map (kbd "C-s")       'doc-view-search)
     (define-key map (kbd "<find>")    'doc-view-search)
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 6ce4e74c7ed..08f04f1d7fb 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -452,12 +452,12 @@ call."
 
     ;; Transformation keys
     (define-key map "sf" 'image-mode-fit-frame)
-    (define-key map "sb" 'image-transform-fit-both)
     (define-key map "sh" 'image-transform-fit-to-height)
     (define-key map "sw" 'image-transform-fit-to-width)
+    (define-key map "sb" 'image-transform-fit-both)
+    (define-key map "ss" 'image-transform-set-scale)
     (define-key map "sr" 'image-transform-set-rotation)
     (define-key map "s0" 'image-transform-reset)
-    (define-key map "ss" 'image-transform-set-scale)
 
     ;; Multi-frame keys
     (define-key map (kbd "RET") 'image-toggle-animation)
@@ -512,6 +512,8 @@ call."
          :help "Resize image to match the window width"]
         ["Fit to Window Height and Width" image-transform-fit-both
          :help "Resize image to match the window height and width"]
+        ["Set Scale..." image-transform-set-scale
+         :help "Resize image by specified scale factor"]
         ["Rotate Image..." image-transform-set-rotation
          :help "Rotate the image"]
         ["Reset Transformations" image-transform-reset