Merge branch 'with-masto-buf-2' into develop

5 files changed, 260 insertions, 299 deletions

diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 35a9ebb..241fbbe 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -38,6 +38,8 @@
 (require 'cl-lib)
 (require 'persist)
 (require 'parse-time)
+(eval-when-compile
+  (require 'mastodon-tl))
 
 (autoload 'mastodon-auth--get-account-id "mastodon-auth")
 (autoload 'mastodon-auth--get-account-name "mastodon-auth.el")
@@ -493,21 +495,15 @@ This endpoint only holds a few preferences. For others, see
   (let* ((url (mastodon-http--api "preferences"))
          (response (mastodon-http--get-json url))
          (buf (get-buffer-create "*mastodon-preferences*")))
-    (with-current-buffer buf
-      (switch-to-buffer-other-window buf)
-      (erase-buffer)
-      (special-mode)
-      (mastodon-tl--set-buffer-spec (buffer-name buf)
-                                    "preferences"
-                                    nil)
-      (let ((inhibit-read-only t))
-        (while response
-          (let ((el (pop response)))
-            (insert
-             (format "%-30s %s"
-                     (prin1-to-string (car el))
-                     (prin1-to-string (cdr el)))
-             "\n\n"))))
+    (with-mastodon-buffer buf #'special-mode :other-window
+      (mastodon-tl--set-buffer-spec (buffer-name buf) "preferences" nil)
+      (while response
+        (let ((el (pop response)))
+          (insert
+           (format "%-30s %s"
+                   (prin1-to-string (car el))
+                   (prin1-to-string (cdr el)))
+           "\n\n")))
       (goto-char (point-min)))))
 
 ;; PROFILE VIEW DETAILS
@@ -605,95 +601,91 @@ HEADERS means also fetch link headers for pagination."
          (fields (mastodon-profile--fields-get account))
          (pinned (mastodon-profile--get-statuses-pinned account))
          (joined (mastodon-profile--account-field account 'created_at)))
-    (with-current-buffer (get-buffer-create buffer)
-      (let ((inhibit-read-only t))
-        (switch-to-buffer buffer)
-        (erase-buffer)
-        (mastodon-mode)
-        (mastodon-profile-mode)
-        (setq mastodon-profile--account account)
-        (mastodon-tl--set-buffer-spec buffer
-                                      endpoint
-                                      update-function
-                                      link-header)
-        (let* ((inhibit-read-only t)
-               (is-statuses (string= endpoint-type "statuses"))
-               (is-followers (string= endpoint-type "followers"))
-               (is-following (string= endpoint-type "following"))
-               (endpoint-name (cond
-                               (is-statuses (if no-reblogs
-                                                "  TOOTS (no boosts)"
-                                              "    TOOTS    "))
-                               (is-followers "  FOLLOWERS  ")
-                               (is-following "  FOLLOWING  "))))
-          (insert
+    (with-mastodon-buffer buffer #'mastodon-mode nil
+      (mastodon-profile-mode)
+      (setq mastodon-profile--account account)
+      (mastodon-tl--set-buffer-spec buffer
+                                    endpoint
+                                    update-function
+                                    link-header)
+      (let* ((inhibit-read-only t)
+             (is-statuses (string= endpoint-type "statuses"))
+             (is-followers (string= endpoint-type "followers"))
+             (is-following (string= endpoint-type "following"))
+             (endpoint-name (cond
+                             (is-statuses (if no-reblogs
+                                              "  TOOTS (no boosts)"
+                                            "    TOOTS    "))
+                             (is-followers "  FOLLOWERS  ")
+                             (is-following "  FOLLOWING  "))))
+        (insert
+         (propertize
+          (concat
+           "\n"
+           (mastodon-profile--image-from-account account 'avatar_static)
+           (mastodon-profile--image-from-account account 'header_static)
+           "\n"
+           (propertize (mastodon-profile--account-field
+                        account 'display_name)
+                       'face 'mastodon-display-name-face)
+           "\n"
+           (propertize (concat "@" acct)
+                       'face 'default)
+           (if (equal locked t)
+               (concat " " (mastodon-tl--symbol 'locked))
+             "")
+           "\n " mastodon-tl--horiz-bar "\n"
+           ;; profile note:
+           ;; account here to enable tab-stops in profile note
+           (mastodon-tl--render-text note account)
+           ;; meta fields:
+           (if fields
+               (concat "\n"
+                       (mastodon-tl--set-face
+                        (mastodon-profile--fields-insert fields)
+                        'success))
+             "")
+           "\n"
+           ;; Joined date:
            (propertize
-            (concat
-             "\n"
-             (mastodon-profile--image-from-account account 'avatar_static)
-             (mastodon-profile--image-from-account account 'header_static)
-             "\n"
-             (propertize (mastodon-profile--account-field
-                          account 'display_name)
-                         'face 'mastodon-display-name-face)
-             "\n"
-             (propertize (concat "@" acct)
-                         'face 'default)
-             (if (equal locked t)
-                 (concat " " (mastodon-tl--symbol 'locked))
-               "")
-             "\n " mastodon-tl--horiz-bar "\n"
-             ;; profile note:
-             ;; account here to enable tab-stops in profile note
-             (mastodon-tl--render-text note account)
-             ;; meta fields:
-             (if fields
-                 (concat "\n"
-                         (mastodon-tl--set-face
-                          (mastodon-profile--fields-insert fields)
-                          'success))
-               "")
-             "\n"
-             ;; Joined date:
-             (propertize
-              (mastodon-profile--format-joined-date-string joined)
-              'face 'success)
-             "\n\n")
-            'profile-json account)
-           ;; insert counts
-           (mastodon-tl--set-face
-            (concat " " mastodon-tl--horiz-bar "\n"
-                    " TOOTS: " toots-count " | "
-                    "FOLLOWERS: " followers-count " | "
-                    "FOLLOWING: " following-count "\n"
-                    " " mastodon-tl--horiz-bar "\n\n")
-            'success)
-           ;; insert relationship (follows)
-           (if followsp
-               (mastodon-tl--set-face
-                (concat (when (equal follows-you 't)
-                          " | FOLLOWS YOU")
-                        (when (equal followed-by-you 't)
-                          " | FOLLOWED BY YOU")
-                        (when (equal requested-you 't)
-                          " | REQUESTED TO FOLLOW YOU")
-                        "\n\n")
-                'success)
-             "") ; if no followsp we still need str-or-char-p for insert
-           ;; insert endpoint
-           (mastodon-tl--set-face
-            (concat " " mastodon-tl--horiz-bar "\n"
-                    endpoint-name "\n"
-                    " " mastodon-tl--horiz-bar "\n")
-            'success))
-          (setq mastodon-tl--update-point (point))
-          (mastodon-media--inline-images (point-min) (point))
-          ;; insert pinned toots first
-          (when (and pinned (equal endpoint-type "statuses"))
-            (mastodon-profile--insert-statuses-pinned pinned)
-            (setq mastodon-tl--update-point (point))) ;updates to follow pinned toots
-          (funcall update-function json)))
-      (goto-char (point-min)))))
+            (mastodon-profile--format-joined-date-string joined)
+            'face 'success)
+           "\n\n")
+          'profile-json account)
+         ;; insert counts
+         (mastodon-tl--set-face
+          (concat " " mastodon-tl--horiz-bar "\n"
+                  " TOOTS: " toots-count " | "
+                  "FOLLOWERS: " followers-count " | "
+                  "FOLLOWING: " following-count "\n"
+                  " " mastodon-tl--horiz-bar "\n\n")
+          'success)
+         ;; insert relationship (follows)
+         (if followsp
+             (mastodon-tl--set-face
+              (concat (when (equal follows-you 't)
+                        " | FOLLOWS YOU")
+                      (when (equal followed-by-you 't)
+                        " | FOLLOWED BY YOU")
+                      (when (equal requested-you 't)
+                        " | REQUESTED TO FOLLOW YOU")
+                      "\n\n")
+              'success)
+           "") ; if no followsp we still need str-or-char-p for insert
+         ;; insert endpoint
+         (mastodon-tl--set-face
+          (concat " " mastodon-tl--horiz-bar "\n"
+                  endpoint-name "\n"
+                  " " mastodon-tl--horiz-bar "\n")
+          'success))
+        (setq mastodon-tl--update-point (point))
+        (mastodon-media--inline-images (point-min) (point))
+        ;; insert pinned toots first
+        (when (and pinned (equal endpoint-type "statuses"))
+          (mastodon-profile--insert-statuses-pinned pinned)
+          (setq mastodon-tl--update-point (point))) ;updates to follow pinned toots
+        (funcall update-function json)))
+    (goto-char (point-min))))
 
 (defun mastodon-profile--format-joined-date-string (joined)
   "Format a human-readable Joined string from timestamp JOINED.
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 8cfa3cb..4b5f2e0 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -29,6 +29,8 @@
 
 ;;; Code:
 (require 'json)
+(eval-when-compile
+  (require 'mastodon-tl))
 
 (autoload 'mastodon-auth--access-token "mastodon-auth")
 (autoload 'mastodon-http--api "mastodon-http")
@@ -118,22 +120,18 @@ PRINT-FUN is the function used to print the data from the response."
                       (message "todo"))))
          (buffer (get-buffer-create
                   (format "*mastodon-trending-%s*" type))))
-    (with-current-buffer buffer
-      (switch-to-buffer (current-buffer))
-      (mastodon-mode)
-      (let ((inhibit-read-only t))
-        (erase-buffer)
-        (mastodon-tl--set-buffer-spec (buffer-name buffer)
-                                      (format "api/v1/trends/%s" type)
-                                      nil)
-        (insert (mastodon-tl--set-face
-                 (concat "\n " mastodon-tl--horiz-bar "\n"
-                         (upcase (format " TRENDING %s\n" type))
-                         " " mastodon-tl--horiz-bar "\n\n")
-                 'success))
-        (funcall print-fun data)
-        (unless (equal type "statuses")
-          (goto-char (point-min)))))))
+    (with-mastodon-buffer buffer #'mastodon-mode nil
+      (mastodon-tl--set-buffer-spec (buffer-name buffer)
+                                    (format "api/v1/trends/%s" type)
+                                    nil)
+      (insert (mastodon-tl--set-face
+               (concat "\n " mastodon-tl--horiz-bar "\n"
+                       (upcase (format " TRENDING %s\n" type))
+                       " " mastodon-tl--horiz-bar "\n\n")
+               'success))
+      (funcall print-fun data)
+      (unless (equal type "statuses")
+        (goto-char (point-min))))))
 
 ;; functions for mastodon search
 
@@ -153,36 +151,32 @@ PRINT-FUN is the function used to print the data from the response."
                             tags))
          (toots-list-json
           (mastodon-search--get-full-statuses-data statuses)))
-    (with-current-buffer (get-buffer-create buffer)
-      (switch-to-buffer buffer)
-      (mastodon-mode)
-      (let ((inhibit-read-only t))
-        (erase-buffer)
-        (mastodon-tl--set-buffer-spec buffer
-                                      "api/v2/search"
-                                      nil)
-        ;; user results:
-        (insert (mastodon-tl--set-face
-                 (concat "\n " mastodon-tl--horiz-bar "\n"
-                         " USERS\n"
-                         " " mastodon-tl--horiz-bar "\n\n")
-                 'success))
-        (mastodon-search--insert-users-propertized accts :note)
-        ;; hashtag results:
-        (insert (mastodon-tl--set-face
-                 (concat "\n " mastodon-tl--horiz-bar "\n"
-                         " HASHTAGS\n"
-                         " " mastodon-tl--horiz-bar "\n\n")
-                 'success))
-        (mastodon-search--print-tags-list tags-list)
-        ;; status results:
-        (insert (mastodon-tl--set-face
-                 (concat "\n " mastodon-tl--horiz-bar "\n"
-                         " STATUSES\n"
-                         " " mastodon-tl--horiz-bar "\n")
-                 'success))
-        (mapc #'mastodon-tl--toot toots-list-json)
-        (goto-char (point-min))))))
+    (with-mastodon-buffer buffer #'mastodon-mode nil
+      (mastodon-tl--set-buffer-spec buffer
+                                    "api/v2/search"
+                                    nil)
+      ;; user results:
+      (insert (mastodon-tl--set-face
+               (concat "\n " mastodon-tl--horiz-bar "\n"
+                       " USERS\n"
+                       " " mastodon-tl--horiz-bar "\n\n")
+               'success))
+      (mastodon-search--insert-users-propertized accts :note)
+      ;; hashtag results:
+      (insert (mastodon-tl--set-face
+               (concat "\n " mastodon-tl--horiz-bar "\n"
+                       " HASHTAGS\n"
+                       " " mastodon-tl--horiz-bar "\n\n")
+               'success))
+      (mastodon-search--print-tags-list tags-list)
+      ;; status results:
+      (insert (mastodon-tl--set-face
+               (concat "\n " mastodon-tl--horiz-bar "\n"
+                       " STATUSES\n"
+                       " " mastodon-tl--horiz-bar "\n")
+               'success))
+      (mapc #'mastodon-tl--toot toots-list-json)
+      (goto-char (point-min)))))
 
 (defun mastodon-search--insert-users-propertized (json &optional note)
   "Insert users list into the buffer.
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 5797f7b..ce3f8c3 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -257,6 +257,24 @@ types of mastodon links and not just shr.el-generated ones.")
 It is active where point is placed by `mastodon-tl--goto-next-toot.'")
 
 
+;;; MACRO
+(defmacro with-mastodon-buffer (buffer mode-fun other-window &rest body)
+  "Evaluate BODY in a new or existing buffer called BUFFER.
+MODE-FUN is called to set the major mode.
+OTHER-WINDOW means call `switch-to-buffer-other-window' rather
+than `switch-to-buffer'."
+  (declare (debug t)
+           (indent 3))
+  `(with-current-buffer (get-buffer-create ,buffer)
+     (let ((inhibit-read-only t))
+       (erase-buffer)
+       (funcall ,mode-fun)
+       (if ,other-window
+           (switch-to-buffer-other-window ,buffer)
+         (switch-to-buffer ,buffer))
+       ,@body)))
+
+
 ;;; NAV
 
 (defun mastodon-tl--next-tab-item ()
@@ -1720,16 +1738,9 @@ ID is that of the toot to view."
                 (mastodon-http--api (concat "statuses/" id)))))
     (if (equal (caar toot) 'error)
         (message "Error: %s" (cdar toot))
-      (with-current-buffer (get-buffer-create buffer)
-        (let ((inhibit-read-only t))
-          (erase-buffer)
-          (switch-to-buffer buffer)
-          (mastodon-mode)
-          (mastodon-tl--set-buffer-spec buffer
-                                        (format "statuses/%s" id)
-                                        nil)
-          (let ((inhibit-read-only t))
-            (mastodon-tl--toot toot :detailed-p)))))))
+      (with-mastodon-buffer buffer #'mastodon-mode nil
+        (mastodon-tl--set-buffer-spec buffer (format "statuses/%s" id) nil)
+        (mastodon-tl--toot toot :detailed-p)))))
 
 (defun mastodon-tl--view-whole-thread ()
   "From a thread view, view entire thread.
@@ -1769,27 +1780,21 @@ view all branches of a thread."
                     (length (alist-get 'descendants context)))
                  0)
               ;; if we have a thread:
-              (progn
-                (with-current-buffer (get-buffer-create buffer)
-                  (let ((inhibit-read-only t)
-                        (marker (make-marker)))
-                    (switch-to-buffer buffer)
-                    (erase-buffer)
-                    (mastodon-mode)
-                    (mastodon-tl--set-buffer-spec buffer
-                                                  endpoint
-                                                  #'mastodon-tl--thread)
-                    (mastodon-tl--timeline (alist-get 'ancestors context)
-                                           :thread)
-                    (goto-char (point-max))
-                    (move-marker marker (point))
-                    ;; print re-fetched toot:
-                    (mastodon-tl--toot toot :detailed-p :thread)
-                    (mastodon-tl--timeline (alist-get 'descendants context)
-                                           :thread)
-                    ;; put point at the toot:
-                    (goto-char (marker-position marker))
-                    (mastodon-tl--goto-next-toot))))
+              (with-mastodon-buffer buffer #'mastodon-mode nil
+                (let ((marker (make-marker)))
+                  (mastodon-tl--set-buffer-spec buffer
+                                                endpoint
+                                                #'mastodon-tl--thread)
+                  (mastodon-tl--timeline (alist-get 'ancestors context) :thread)
+                  (goto-char (point-max))
+                  (move-marker marker (point))
+                  ;; print re-fetched toot:
+                  (mastodon-tl--toot toot :detailed-p :thread)
+                  (mastodon-tl--timeline (alist-get 'descendants context)
+                                         :thread)
+                  ;; put point at the toot:
+                  (goto-char (marker-position marker))
+                  (mastodon-tl--goto-next-toot)))
             ;; else just print the lone toot:
             (mastodon-tl--single-toot id)))))))
 
@@ -2586,47 +2591,33 @@ RESPONSE is the data returned from the server by
 JSON and http headers, without it just the JSON."
   (let ((json (if headers (car response) response)))
     (if (not json) ; praying this is right here, else try "\n[]"
-	    (message "Looks like nothing returned from endpoint: %s" endpoint)
+	(message "Looks like nothing returned from endpoint: %s" endpoint)
       (let* ((headers (if headers (cdr response) nil))
              (link-header (mastodon-tl--get-link-header-from-response headers)))
-        (with-current-buffer (get-buffer-create buffer)
-          (let ((inhibit-read-only t))
-            (erase-buffer)
-            (switch-to-buffer buffer)
-            ;; mastodon-mode wipes buffer-spec, so order must unforch be:
-            ;; 1 run update-function, 2 enable masto-mode, 3 set buffer spec.
-            ;; which means we cannot use buffer-spec for update-function
-            ;; unless we set it both before and after the others
-            (mastodon-tl--set-buffer-spec buffer
-                                          endpoint
-                                          update-function
-                                          link-header
-                                          update-params
-                                          hide-replies)
-            (setq
-             ;; Initialize with a minimal interval; we re-scan at least once
-             ;; every 5 minutes to catch any timestamps we may have missed
-             mastodon-tl--timestamp-next-update (time-add (current-time)
-                                                          (seconds-to-time 300)))
-            (funcall update-function json)
-            (mastodon-mode)
-            (mastodon-tl--set-buffer-spec buffer
-                                          endpoint
-                                          update-function
-                                          link-header
-                                          update-params
-                                          hide-replies)
-            (setq mastodon-tl--timestamp-update-timer
-                  (when mastodon-tl--enable-relative-timestamps
-                    (run-at-time (time-to-seconds
-                                  (time-subtract mastodon-tl--timestamp-next-update
-                                                 (current-time)))
-                                 nil ;; don't repeat
-                                 #'mastodon-tl--update-timestamps-callback
-                                 (current-buffer)
-                                 nil)))
-            (unless (mastodon-tl--profile-buffer-p)
-              (mastodon-tl--goto-first-item))))))))
+        (with-mastodon-buffer buffer #'mastodon-mode nil
+          (mastodon-tl--set-buffer-spec buffer
+                                        endpoint
+                                        update-function
+                                        link-header
+                                        update-params
+                                        hide-replies)
+          (funcall update-function json)
+          (setq
+           ;; Initialize with a minimal interval; we re-scan at least once
+           ;; every 5 minutes to catch any timestamps we may have missed
+           mastodon-tl--timestamp-next-update (time-add (current-time)
+                                                        (seconds-to-time 300)))
+          (setq mastodon-tl--timestamp-update-timer
+                (when mastodon-tl--enable-relative-timestamps
+                  (run-at-time (time-to-seconds
+                                (time-subtract mastodon-tl--timestamp-next-update
+                                               (current-time)))
+                               nil ;; don't repeat
+                               #'mastodon-tl--update-timestamps-callback
+                               (current-buffer)
+                               nil)))
+          (unless (mastodon-tl--profile-buffer-p)
+            (mastodon-tl--goto-first-item)))))))
 
 (defun mastodon-tl--init-sync (buffer-name endpoint update-function &optional note-type)
   "Initialize BUFFER-NAME with timeline targeted by ENDPOINT.
@@ -2642,36 +2633,27 @@ Optional arg NOTE-TYPE means only get that type of note."
          (url (mastodon-http--api endpoint))
          (buffer (concat "*mastodon-" buffer-name "*"))
          (json (mastodon-http--get-json url args)))
-    (with-current-buffer (get-buffer-create buffer)
-      (let ((inhibit-read-only t))
-        (erase-buffer)
-        (switch-to-buffer buffer)
-        ;; mastodon-mode wipes buffer-spec, so order must unforch be:
-        ;; 1 run update-function, 2 enable masto-mode, 3 set buffer spec.
-        ;; which means we cannot use buffer-spec for update-function
-        ;; unless we set it both before and after the others
-        (mastodon-tl--set-buffer-spec buffer endpoint update-function)
-        (setq
-         ;; Initialize with a minimal interval; we re-scan at least once
-         ;; every 5 minutes to catch any timestamps we may have missed
-         mastodon-tl--timestamp-next-update (time-add (current-time)
-                                                      (seconds-to-time 300)))
-        (funcall update-function json)
-        (mastodon-mode)
-        (mastodon-tl--set-buffer-spec buffer endpoint update-function nil args)
-        (setq mastodon-tl--timestamp-update-timer
-              (when mastodon-tl--enable-relative-timestamps
-                (run-at-time (time-to-seconds
-                              (time-subtract mastodon-tl--timestamp-next-update
-                                             (current-time)))
-                             nil ;; don't repeat
-                             #'mastodon-tl--update-timestamps-callback
-                             (current-buffer)
-                             nil)))
-        (unless (mastodon-tl--profile-buffer-p)
-          ;; FIXME: this breaks test (because test has empty buffer)
-          (mastodon-tl--goto-first-item)))
-      buffer)))
+    (with-mastodon-buffer buffer #'mastodon-mode nil
+      (setq
+       ;; Initialize with a minimal interval; we re-scan at least once
+       ;; every 5 minutes to catch any timestamps we may have missed
+       mastodon-tl--timestamp-next-update (time-add (current-time)
+                                                    (seconds-to-time 300)))
+      (funcall update-function json)
+      (mastodon-tl--set-buffer-spec buffer endpoint update-function nil args)
+      (setq mastodon-tl--timestamp-update-timer
+            (when mastodon-tl--enable-relative-timestamps
+              (run-at-time (time-to-seconds
+                            (time-subtract mastodon-tl--timestamp-next-update
+                                           (current-time)))
+                           nil ;; don't repeat
+                           #'mastodon-tl--update-timestamps-callback
+                           (current-buffer)
+                           nil)))
+      (unless (mastodon-tl--profile-buffer-p)
+        ;; FIXME: this breaks test (because test has empty buffer)
+        (mastodon-tl--goto-first-item)))
+    buffer))
 
 (provide 'mastodon-tl)
 ;;; mastodon-tl.el ends here
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 5f9e6eb..825831d 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -44,13 +44,15 @@
 (require 'facemenu)
 (require 'text-property-search)
 
+(eval-when-compile
+  (require 'mastodon-tl))
+
 (defvar mastodon-instance-url)
 (defvar mastodon-tl--buffer-spec)
 (defvar mastodon-tl--enable-proportional-fonts)
 (defvar mastodon-profile-account-settings)
 
 (autoload 'iso8601-parse "iso8601")
-(autoload 'with-mastodon-buffer "mastodon")
 (autoload 'mastodon-auth--user-acct "mastodon-auth")
 (autoload 'mastodon-http--api "mastodon-http")
 (autoload 'mastodon-http--build-array-params-alist "mastodon-http")
@@ -901,31 +903,28 @@ instance to edit a toot."
   "View editing history of the toot at point in a popup buffer."
   (interactive)
   (let ((id (mastodon-tl--property 'base-toot-id))
-        (history (mastodon-tl--property 'edit-history)))
-    (with-current-buffer (get-buffer-create "*mastodon-toot-edits*")
-      (let ((inhibit-read-only t))
-        (special-mode)
-        (erase-buffer)
-        (let ((count 1))
-          (mapc (lambda (x)
-                  (insert (propertize (if (= count 1)
-                                          (format "%s [original]:\n" count)
-                                        (format "%s:\n" count))
-                                      'face font-lock-comment-face)
-                          (mastodon-toot--insert-toot-iter x)
-                          "\n")
-                  (cl-incf count))
-                history))
-        (switch-to-buffer-other-window (current-buffer))
-        (setq-local header-line-format
-                    (propertize
-                     (format "Edits to toot by %s:"
-                             (alist-get 'username
-                                        (alist-get 'account (car history))))
-                     'face font-lock-comment-face))
-        (mastodon-tl--set-buffer-spec (buffer-name (current-buffer))
-                                      (format "statuses/%s/history" id)
-                                      nil)))))
+        (history (mastodon-tl--property 'edit-history))
+        (buf "*mastodon-toot-edits*"))
+    (with-mastodon-buffer buf #'special-mode :other-window
+      (let ((count 1))
+        (mapc (lambda (x)
+                (insert (propertize (if (= count 1)
+                                        (format "%s [original]:\n" count)
+                                      (format "%s:\n" count))
+                                    'face font-lock-comment-face)
+                        (mastodon-toot--insert-toot-iter x)
+                        "\n")
+                (cl-incf count))
+              history))
+      (setq-local header-line-format
+                  (propertize
+                   (format "Edits to toot by %s:"
+                           (alist-get 'username
+                                      (alist-get 'account (car history))))
+                   'face font-lock-comment-face))
+      (mastodon-tl--set-buffer-spec (buffer-name (current-buffer))
+                                    (format "statuses/%s/history" id)
+                                    nil))))
 
 (defun mastodon-toot--insert-toot-iter (it)
   "Insert iteration IT of toot."
diff --git a/lisp/mastodon-views.el b/lisp/mastodon-views.el
index 7481fc3..4f102a6 100644
--- a/lisp/mastodon-views.el
+++ b/lisp/mastodon-views.el
@@ -36,6 +36,8 @@
 
 (require 'cl-lib)
 (require 'mastodon-http)
+(eval-when-compile
+  (require 'mastodon-tl))
 
 (defvar mastodon-mode-map)
 (defvar mastodon-tl--horiz-bar)
@@ -799,30 +801,22 @@ INSTANCE is the instance were are working with."
     (let* ((domain (url-file-nondirectory instance))
            (buf (get-buffer-create
                  (format "*mastodon-instance-%s*" domain))))
-      (with-current-buffer buf
-        (switch-to-buffer-other-window buf)
-        (let ((inhibit-read-only t))
-          (erase-buffer)
-          (special-mode)
-          (when brief
-            (setq response
-                  (list (assoc 'uri response)
-                        (assoc 'title response)
-                        (assoc 'short_description response)
-                        (assoc 'email response)
-                        (cons 'contact_account
-                              (list
-                               (assoc 'username
-                                      (assoc 'contact_account response))))
-                        (assoc 'rules response)
-                        (assoc 'stats response))))
-          (mastodon-views--print-json-keys response)
-          ;; (mastodon-mode) ; breaks our 'q' binding that avoids leaving
-          ;; split window
-          (mastodon-tl--set-buffer-spec (buffer-name buf)
-                                        "instance"
-                                        nil)
-          (goto-char (point-min)))))))
+      (with-mastodon-buffer buf #'special-mode :other-window
+        (when brief
+          (setq response
+                (list (assoc 'uri response)
+                      (assoc 'title response)
+                      (assoc 'short_description response)
+                      (assoc 'email response)
+                      (cons 'contact_account
+                            (list
+                             (assoc 'username
+                                    (assoc 'contact_account response))))
+                      (assoc 'rules response)
+                      (assoc 'stats response))))
+        (mastodon-views--print-json-keys response)
+        (mastodon-tl--set-buffer-spec (buffer-name buf) "instance" nil)
+        (goto-char (point-min))))))
 
 (defun mastodon-views--format-key (el pad)
   "Format a key of element EL, a cons, with PAD padding."