diff options
| author | Alexander Griffith <griffitaj@gmail.com> | 2017-04-24 12:16:50 -0400 |
|---|---|---|
| committer | Johnson Denen <johnson.denen@gmail.com> | 2017-04-24 23:18:59 -0400 |
| commit | d744f45f1f52d3ea0a21376e6b877a0303c7dc95 (patch) | |
| tree | 2670503852c599035f546ebf66d609abdb84d4d1 /lisp | |
| parent | 6cd700b2c73f1302abd7ac65504a78250985f8a7 (diff) | |
Fix #41 cleaned up fork
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/mastodon-media.el | 6 | ||||
| -rw-r--r-- | lisp/mastodon-tl.el | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el index 6a4b177..94abad9 100644 --- a/lisp/mastodon-media.el +++ b/lisp/mastodon-media.el @@ -25,12 +25,16 @@ ;; mastodon-media.el provides functions for inlining media. +;; Known bug gnutls -12 when trying to access images on some systems. +;; It looks like their may be a version mismatch between the encryption +;; required by the server and client. + ;;; Code: (require 'mastodon-http) (defun mastodon-media--image-from-url (url) "Takes a url and returns an image" - (let ((buffer (mastodon-http--get url))) + (let ((buffer (url-retrieve-synchronously url))) (unwind-protect (let ((data (with-current-buffer buffer (goto-char (point-min)) diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el index 385580e..dfea63d 100644 --- a/lisp/mastodon-tl.el +++ b/lisp/mastodon-tl.el @@ -146,7 +146,7 @@ Return value from boosted content if available." (defun mastodon-tl--set-face (string face render) - "Set the face of a string. If `render` is not 'nil + "Set the face of a string. If `render' is not 'nil also render the html" (propertize (with-temp-buffer |