master ff63787ea1: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit ff63787ea18a27e991052ca04d0de0526ad5ec59
Merge: ec403abc60 c34d06e3d7
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    c34d06e3d7 * configure.ac (LIBSECCOMP): Bump minimum version for facc...
    335a5a9e0f Make the `f' command work in image-mode again
---
 configure.ac  | 2 +-
 lisp/image.el | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index ae92b85be1..9f4d5db43f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4651,7 +4651,7 @@ AC_CHECK_HEADERS(
     ]])])
 AC_SUBST([HAVE_SECCOMP])
 
-EMACS_CHECK_MODULES([LIBSECCOMP], [libseccomp >= 2.4.0])
+EMACS_CHECK_MODULES([LIBSECCOMP], [libseccomp >= 2.5.2])
 AC_SUBST([HAVE_LIBSECCOMP])
 AC_SUBST([LIBSECCOMP_LIBS])
 AC_SUBST([LIBSECCOMP_CFLAGS])
diff --git a/lisp/image.el b/lisp/image.el
index c9165f7781..80815a8a66 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -894,8 +894,9 @@ Frames are indexed from 0.  Optional argument NOCHECK 
non-nil means
 do not check N is within the range of frames present in the image."
   (unless nocheck
     (if (< n 0) (setq n 0)
-      (setq n (min n (1- (car (plist-get (cdr image)
-                                         :animate-multi-frame-data)))))))
+      (setq n (min n (1- (car (or (plist-get (cdr image)
+                                             :animate-multi-frame-data)
+                                  (image-multi-frame-p image))))))))
   (plist-put (cdr image) :index n)
   (force-window-update (plist-get (cdr image) :animate-buffer)))