From 5970c9de908fbb8009de86a2371578de231b3cee Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 6 May 2023 14:46:34 +0200
Subject: Revert "updates to with-mastodon-buffer macro"

This reverts commit 59e5e3ece54bcac36d9debad392bff25a31438b5.
---
 lisp/mastodon-views.el | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

(limited to 'lisp/mastodon-views.el')

diff --git a/lisp/mastodon-views.el b/lisp/mastodon-views.el
index 8585bb0..7481fc3 100644
--- a/lisp/mastodon-views.el
+++ b/lisp/mastodon-views.el
@@ -799,27 +799,30 @@ INSTANCE is the instance were are working with."
     (let* ((domain (url-file-nondirectory instance))
            (buf (get-buffer-create
                  (format "*mastodon-instance-%s*" domain))))
-      (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-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-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)))))))
 
 (defun mastodon-views--format-key (el pad)
   "Format a key of element EL, a cons, with PAD padding."
-- 
cgit v1.2.3