emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-28 b38223a844: A friendlier error message from image-mode in an em


From: Eli Zaretskii
Subject: emacs-28 b38223a844: A friendlier error message from image-mode in an empty buffer
Date: Mon, 21 Feb 2022 07:53:34 -0500 (EST)

branch: emacs-28
commit b38223a844caef920c2cd2c6e56e84b0c91df1fa
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    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)
---
 lisp/image-mode.el | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index b87cf213d7..1eb7cd58c3 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 ()



reply via email to

[Prev in Thread] Current Thread [Next in Thread]