From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 21 Feb 2022 12:51:37 +0000 (+0200)
Subject: A friendlier error message from image-mode in an empty buffer
X-Git-Tag: emacs-28.0.92~36
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b38223a844caef920c2cd2c6e56e84b0c91df1fa;p=emacs.git

A friendlier error message from image-mode in an empty buffer

* lisp/image-mode.el (image-mode): Handle the case where the empty
buffer doesn't visit a file  (Bug#54084)
---

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index b87cf213d7e..1eb7cd58c3d 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -621,9 +621,11 @@ Key bindings:
   ;; Bail out early if we have no image data.
   (if (zerop (buffer-size))
       (funcall (if (called-interactively-p 'any) 'error 'message)
-               (if (file-exists-p buffer-file-name)
-                   "Empty file"
-                 "(New file)"))
+               (if (stringp buffer-file-name)
+                   (if (file-exists-p buffer-file-name)
+                       "Empty file"
+                     "(New file)")
+                 "Empty buffer"))
     (image-mode--display)))
 
 (defun image-mode--display ()