aboutsummaryrefslogtreecommitdiff
path: root/lisp/mastodon-media.el
diff options
context:
space:
mode:
authormarty hiatt <martianhiatus [a t] riseup [d o t] net>2023-03-21 14:50:55 +0100
committermarty hiatt <martianhiatus [a t] riseup [d o t] net>2023-03-21 14:50:55 +0100
commitfdeeb396c7c2c9a6618661e2ea5d24b999a0e42f (patch)
tree7da88b00c9b2f7806ecd039fb3b7f4d9e8669f7c /lisp/mastodon-media.el
parentd654ab86bde598072d6b8e6a4ca398198bfb9882 (diff)
manually(!) apply stephan monnier's patch, save the ts work
thanks stephan!
Diffstat (limited to 'lisp/mastodon-media.el')
-rw-r--r--lisp/mastodon-media.el7
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 3fb10b0..63860bd 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -50,17 +50,14 @@
(defcustom mastodon-media--avatar-height 20
"Height of the user avatar images (if shown)."
- :group 'mastodon-media
:type 'integer)
(defcustom mastodon-media--preview-max-height 250
"Max height of any media attachment preview to be shown in timelines."
- :group 'mastodon-media
:type 'integer)
(defcustom mastodon-media--enable-image-caching nil
"Whether images should be cached."
- :group 'mastodon-media
:type 'boolean)
(defvar mastodon-media--generic-avatar-data
@@ -139,7 +136,7 @@ CAQgEIBAAAIBFiNOFMaY6V1tnFhkDQIQCEAgAIEABAKAQAACAQgEIBCAQAACAQgEIBCAQABIXO4e
c1y+zhoEIBCAQAAQCEAgAIEABAIQCEAgAIEABAIQCEAgAAgEIBCAQAACAQgEIBCAQAACAQgEAIEA
BAIQCEAgAIEABAIsJVH58WqHw8FIgjUIQCAACAQgEIBAAAIBCAQgEIBAAAIBCAQgEAAEAhAIQCBA
fKRJkmVZjAQwh78A6vCRWJE8K+8AAAAASUVORK5CYII=")
- "The PNG data for a generic 200x200 'broken image' view.")
+ "The PNG data for a generic 200x200 \"broken image\" view.")
(defun mastodon-media--process-image-response
(status-plist marker image-options region-length url)
@@ -185,7 +182,7 @@ with the image."
(defun mastodon-media--load-image-from-url (url media-type start region-length)
"Take a URL and MEDIA-TYPE and load the image asynchronously.
-MEDIA-TYPE is a symbol and either 'avatar or 'media-link.
+MEDIA-TYPE is a symbol and either `avatar' or `media-link.'
START is the position where we start loading the image.
REGION-LENGTH is the range from start to propertize."
(let ((image-options (when (or (image-type-available-p 'imagemagick)