diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-02-22 06:30:59 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-02-22 06:30:59 +0100 |
| commit | bee54495e92ddf5d75e3f68ac7e823b221306719 (patch) | |
| tree | 3469a04a9a7117c7e546e16605b543777d6d3d77 /lisp/image-mode.el | |
| parent | 6b0e23412d367a3b90db01de9456431158525938 (diff) | |
| parent | 666e40a109ea6c0079467e72c806bb04191ff4cc (diff) | |
| download | emacs-bee54495e92ddf5d75e3f68ac7e823b221306719.tar.gz emacs-bee54495e92ddf5d75e3f68ac7e823b221306719.tar.bz2 emacs-bee54495e92ddf5d75e3f68ac7e823b221306719.zip | |
Merge from origin/emacs-28
666e40a109 Fix 'display-line-numbers-mode' in hide-show buffers
68d134cf0f Don't check whether a deleted window is deletable (Bug#54028)
b38223a844 A friendlier error message from image-mode in an empty buffer
b7a651ba37 Update to Org 9.5.2-17-gea6b74
3a8c3f7abd ; Don't reference obsolete variables in edebug.el
Diffstat (limited to 'lisp/image-mode.el')
| -rw-r--r-- | lisp/image-mode.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 5bee155460f..b2af3f06a27 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -645,9 +645,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 () |