Fail gracefully on unsupported image formats.

[elpher.git] / elpher.el

diff --git a/elpher.el b/elpher.el
index 19eb04a..dfd139b 100644 (file)
--- a/elpher.el
+++ b/elpher.el
@@ -1175,14 +1175,16 @@ If ADDRESS is not supplied or nil the record is rendered as an
     (if (display-images-p)
         (let* ((image (create-image
                        data
-                       nil t))
-               (window (get-buffer-window elpher-buffer-name)))
-          (when window
-            (setf (image-property image :max-width) (window-body-width window t))
-            (setf (image-property image :max-height) (window-body-height window t)))
-          (elpher-with-clean-buffer
-           (insert-image image)
-           (elpher-restore-pos)))
+                       nil t)))
+          (if (not image)
+              (error "Unsupported image format")
+            (let ((window (get-buffer-window elpher-buffer-name)))
+              (when window
+                (setf (image-property image :max-width) (window-body-width window t))
+                (setf (image-property image :max-height) (window-body-height window t))))
+            (elpher-with-clean-buffer
+             (insert-image image)
+             (elpher-restore-pos))))
       (elpher-render-download data))))
 
 ;; Search retrieval and rendering
@@ -1519,8 +1521,8 @@ treatment that a separate function is warranted."
              (address (elpher-address-from-gemini-url url))
              (type (if address (elpher-address-type address) nil))
              (type-map-entry (cdr (assoc type elpher-type-map)))
-             (fill-prefix (make-string (+ 1 (length elpher-gemini-link-string)) ?\s))
-             (insert elpher-gemini-link-string))
+             (fill-prefix (make-string (+ 1 (length elpher-gemini-link-string)) ?\s)))
+        (insert elpher-gemini-link-string)
         (if type-map-entry
             (let* ((face (elt type-map-entry 3))
                    (display-string (or given-display-string
@@ -2170,7 +2172,7 @@ When run interactively HOST-OR-URL is read from the minibuffer."
          (url (read-string (format "Visit URL (default scheme %s): " (elpher-get-default-url-scheme))
                            (elpher-address-to-url address))))
     (unless (string-empty-p (string-trim url))
-      (elpher-visit-page (elpher-page-from-url url) (elpher-get-default-url-scheme)))))
+      (elpher-visit-page (elpher-page-from-url url)))))
 
 (defun elpher-redraw ()
   "Redraw current page."