hiro/ement.el
1
0
Fork 0
mirror of https://github.com/vale981/ement.el synced 2025-03-04 17:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix: (ement-room-image-show) Handle invalid images

Browse source
This commit is contained in:
Adam Porter 2021-07-29 18:07:56 -05:00
parent 28528ebdbd
commit 62a740aa9d
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
ement-room.el
View file

@ -1705,25 +1705,27 @@ show it in the buffer."
(if (and ement-room-images image)
;; Images enabled and image downloaded: create image and
;; return it in a string.
(let ((image (create-image image nil 'data-p :ascent 'center))
(buffer-window (when buffer
(get-buffer-window buffer)))
max-height max-width)
;; Calculate max image display size.
(cond (buffer-window
;; Buffer displayed: use window size.
(setf max-height (window-body-height buffer-window t)
max-width (window-body-width buffer-window t)))
(t
;; Buffer not displayed: use frame size.
(setf max-height (frame-pixel-height)
max-width (frame-pixel-width))))
(setf (image-property image :type) 'imagemagick
(image-property image :max-width) max-width
(image-property image :max-height) max-height)
(concat "\n"
(propertize " " 'display image
'keymap ement-room-image-keymap)))
(condition-case err
(let ((image (create-image image nil 'data-p :ascent 'center))
(buffer-window (when buffer
(get-buffer-window buffer)))
max-height max-width)
;; Calculate max image display size.
(cond (buffer-window
;; Buffer displayed: use window size.
(setf max-height (window-body-height buffer-window t)
max-width (window-body-width buffer-window t)))
(t
;; Buffer not displayed: use frame size.
(setf max-height (frame-pixel-height)
max-width (frame-pixel-width))))
(setf (image-property image :type) 'imagemagick
(image-property image :max-width) max-width
(image-property image :max-height) max-height)
(concat "\n"
(propertize " " 'display image
'keymap ement-room-image-keymap)))
(error (format "\n [error inserting image: %s]" (error-message-string err))))
;; Image not downloaded: insert URL as button, and download if enabled.
(prog1
(with-temp-buffer