From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 24 Jan 2022 10:22:49 +0000 (+0100)
Subject: Make the `f' command work in image-mode again
X-Git-Tag: emacs-28.0.92~86
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=335a5a9e0f956d466305c73b6257a6caaefa3533;p=emacs.git

Make the `f' command work in image-mode again

* lisp/image.el (image-show-frame): Protect against not having
computed the animation data yed (bug#53489).
---

diff --git a/lisp/image.el b/lisp/image.el
index af30353b956..ea1a22698c6 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -872,8 +872,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)))