Revert "with-mastodon-buffer macro"

This reverts commit 51f8b782ac6721939e20eca459fe88eb4304857c.

1 files changed, 99 insertions, 77 deletions

diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 759dde8..5797f7b 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -42,7 +42,6 @@
 (autoload 'mastodon-mode "mastodon")
 (autoload 'mastodon-notifications-get "mastodon")
 (autoload 'mastodon-url-lookup "mastodon")
-(autoload 'with-mastodon-buffer "mastodon")
 (autoload 'mastodon-auth--get-account-id "mastodon-auth")
 (autoload 'mastodon-auth--get-account-name "mastodon-auth")
 (autoload 'mastodon-http--api "mastodon-http")
@@ -1721,13 +1720,16 @@ 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-mastodon-buffer
-       buffer
-       (mastodon-tl--set-buffer-spec buffer
-                                     (format "statuses/%s" id)
-                                     nil)
-       (let ((inhibit-read-only t))
-         (mastodon-tl--toot toot :detailed-p))))))
+      (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)))))))
 
 (defun mastodon-tl--view-whole-thread ()
   "From a thread view, view entire thread.
@@ -1767,23 +1769,27 @@ view all branches of a thread."
                     (length (alist-get 'descendants context)))
                  0)
               ;; if we have a thread:
-              (with-mastodon-buffer
-               buffer
-               (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)))
+              (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))))
             ;; else just print the lone toot:
             (mastodon-tl--single-toot id)))))))
 
@@ -2583,31 +2589,44 @@ JSON and http headers, without it just the JSON."
 	    (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-mastodon-buffer
-          buffer
-          (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)
-          (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-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))))))))
 
 (defun mastodon-tl--init-sync (buffer-name endpoint update-function &optional note-type)
   "Initialize BUFFER-NAME with timeline targeted by ENDPOINT.
@@ -2623,33 +2642,36 @@ 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-mastodon-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-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-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)))
 
 (provide 'mastodon-tl)
 ;;; mastodon-tl.el ends here