master f97668c38f: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit f97668c38fe4b503d14200baa4fe9627c2cbcb1b
Merge: f98276f77b ef1e68f11d
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Merge from origin/emacs-28
    
    ef1e68f11d * lisp/image-mode.el (image-mode-as-hex): Fix toggle instr...
    dc0fce3a7d ; lisp/image-mode.el: Fix typo.
    254ba1d3e5 * lisp/image-mode.el: Improve commentary.
    ac43ac1af9 cl-reduce doc string improvement
---
 lisp/emacs-lisp/cl-seq.el |  4 ++++
 lisp/image-mode.el        | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el
index 64ae05bf2a..60e204eaf5 100644
--- a/lisp/emacs-lisp/cl-seq.el
+++ b/lisp/emacs-lisp/cl-seq.el
@@ -139,6 +139,10 @@ only case where FUNCTION is called with fewer than two 
arguments.
 If SEQ contains exactly one element and no :INITIAL-VALUE is
 specified, then return that element and FUNCTION is not called.
 
+If :FROM-END is non-nil, the reduction occurs from the back of
+the SEQ moving forward, and the order of arguments to the
+FUNCTION is also reversed.
+
 \n(fn FUNCTION SEQ [KEYWORD VALUE]...)"
   (cl--parsing-keywords (:from-end (:start 0) :end :initial-value :key) ()
     (or (listp cl-seq) (setq cl-seq (append cl-seq nil)))
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 46c555df27..76c076818f 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -23,10 +23,14 @@
 
 ;;; Commentary:
 
-;; Defines a major mode for visiting image files
-;; that allows conversion between viewing the text of the file,
-;; hex of the file and viewing the file as an image.  Viewing the image
-;; works by putting a `display' text-property on the
+;; Defines `image-mode', a major mode for visiting image files.  Displaying
+;; images only works if Emacs was built with support for displaying
+;; such images.  See Info node `(emacs) Image Mode' for more
+;; information.
+;;
+;; There is support for switching between viewing the text of the
+;; file, the hex of the file and viewing the file as an image.
+;; Viewing the image works by putting a `display' text-property on the
 ;; image data, with the image-data still present underneath; if the
 ;; resulting buffer file is saved to another name it will correctly save
 ;; the image data to the new file.
@@ -789,13 +793,9 @@ See commands `image-mode' and `image-minor-mode' for more 
information
 on these modes."
   (interactive)
   (image-mode-to-text)
-  ;; Turn on hexl-mode
   (hexl-mode)
-  (message (substitute-command-keys
-            "Type \\[image-toggle-hex-display] or \
-\\[image-toggle-display] to view the image as %s")
-           (if (image-get-display-property)
-               "hex" "an image or text")))
+  (message "%s" (substitute-command-keys
+                 "Type \\[hexl-mode-exit] to view the image as an image")))
 
 (defun image-mode-as-text ()
   "Set a non-image mode as major mode in combination with image minor mode.