From a5005a12a912c97ec31d8ace6f7fc9f31151e7a6 Mon Sep 17 00:00:00 2001
From: alexjgriffith <griffitaj	@gmail.com>
Date: Fri, 5 May 2017 13:26:53 -0400
Subject: Moved decode-coding-string out of tl functions

---
 lisp/mastodon-http.el |  5 ++++-
 lisp/mastodon-tl.el   | 11 ++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index d3facc4..2b3f7dc 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -104,7 +104,10 @@ Pass response buffer to CALLBACK function."
          (with-current-buffer (mastodon-http--get url)
            (goto-char (point-min))
            (re-search-forward "^$" nil 'move)
-           (let ((json-string (buffer-substring-no-properties (point) (point-max))))
+           (let ((json-string
+                  (decode-coding-string
+                   (buffer-substring-no-properties (point) (point-max))
+                   'utf-8)))
              (json-read-from-string json-string)))))
     json-vector))
 
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 2964942..67a452d 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -103,11 +103,8 @@ Optionally start from POS."
 (defun mastodon-tl--byline-author (toot)
   "Propertize author of TOOT."
   (let* ((account (cdr (assoc 'account toot)))
-         ;; It may not be necissary to decode the handle
-         (handle (decode-coding-string
-                  (cdr (assoc 'acct account))'utf-8))
-         (name (decode-coding-string
-                (cdr (assoc 'display_name account)) 'utf-8)))
+         (handle (cdr (assoc 'acct account)))
+         (name (cdr (assoc 'display_name account))))
     (concat
      (propertize name 'face 'warning)
      " (@"
@@ -158,7 +155,7 @@ Return value from boosted content if available."
 also render the html"
   (propertize
    (with-temp-buffer
-     (insert (decode-coding-string string 'utf-8))
+     (insert string)
      (when render
        (let ((shr-use-fonts nil))
          (shr-render-region (point-min) (point-max))))
@@ -194,7 +191,7 @@ also render the html"
   (let ((content (mastodon-tl--field 'content toot))
         (shr-use-fonts nil))
     (propertize (with-temp-buffer
-                  (insert (decode-coding-string content 'utf-8))
+                  (insert content)
                   (shr-render-region (point-min) (point-max))
                   (buffer-string))
                 'face 'default)))
-- 
cgit v1.2.3