Merge branch 'develop'

5 files changed, 184 insertions, 164 deletions

diff --git a/README.org b/README.org
index f460b0e..6c026ea 100644
--- a/README.org
+++ b/README.org
@@ -190,7 +190,7 @@ not contain =:client_id= and =:client_secret=.
 
 =M-x mastodon-toot= (or =t= from a mastodon.el buffer).
 
-Pops a new buffer/window in =mastodon-toot= minor mode. Enter the
+Pops a new buffer/window in =text-mode= and =mastodon-toot= minor mode. Enter the
 contents of your toot here. =C-c C-c= sends the toot. =C-c C-k= cancels.
 Both actions kill the buffer and window.
 
@@ -203,6 +203,17 @@ Server's max toot length, and attachment previews, are shown.
 You can download and use your instance's custom emoji
 (=mastodon-toot--download-custom-emoji=, =mastodon-toot--enable-custom-emoji=).
 
+The compose buffer uses =text-mode= so any configuration you have for that mode
+will be enabled. If any of your existing config conflicts with =mastodon-toot=,
+you can disable it in the =mastodon-toot-mode-hook=. For example, the default
+value of that hook is as follows:
+
+#+begin_src emacs-lisp
+(add-hook 'mastodon-toot-mode-hook
+          (lambda ()
+              (auto-fill-mode -1)))
+#+end_src
+
 **** Keybindings
 
 |---------+----------------------------------|
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 8d8d0c7..2607b82 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -658,89 +658,90 @@ 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-output-to-temp-buffer buffer
-      (switch-to-buffer 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 "     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 ------------\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:
+    (with-current-buffer (get-buffer-create buffer)
+      (let ((inhibit-read-only t))
+        (switch-to-buffer 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 "     TOOTS   ")
+                               (is-followers "  FOLLOWERS  ")
+                               (is-following "  FOLLOWING  "))))
+          (insert
            (propertize
-            (mastodon-profile--format-joined-date-string joined)
-            'face 'success)
-           "\n\n")
-          'profile-json account)
-         ;; insert counts
-         (mastodon-tl--set-face
-          (concat " ------------\n"
-                  " TOOTS: " toots-count " | "
-                  "FOLLOWERS: " followers-count " | "
-                  "FOLLOWING: " following-count "\n"
-                  " ------------\n\n")
-          'success)
-         ;; insert relationship (follows)
-         (if followsp
-             (mastodon-tl--set-face
-              (concat (if (equal follows-you 't)
-                          " | FOLLOWS YOU")
-                      (if (equal followed-by-you 't)
-                          " | FOLLOWED BY YOU")
-                      "\n\n")
-              'success)
-           "") ; if no followsp we still need str-or-char-p for insert
-         ;; insert endpoint
-         (mastodon-tl--set-face
-          (concat " ------------\n"
-                  endpoint-name "\n"
-                  " ------------\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))))
+            (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 ------------\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 " ------------\n"
+                    " TOOTS: " toots-count " | "
+                    "FOLLOWERS: " followers-count " | "
+                    "FOLLOWING: " following-count "\n"
+                    " ------------\n\n")
+            'success)
+           ;; insert relationship (follows)
+           (if followsp
+               (mastodon-tl--set-face
+                (concat (if (equal follows-you 't)
+                            " | FOLLOWS YOU")
+                        (if (equal followed-by-you 't)
+                            " | FOLLOWED BY YOU")
+                        "\n\n")
+                'success)
+             "") ; if no followsp we still need str-or-char-p for insert
+           ;; insert endpoint
+           (mastodon-tl--set-face
+            (concat " ------------\n"
+                    endpoint-name "\n"
+                    " ------------\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-tl.el b/lisp/mastodon-tl.el
index 8197315..0309d20 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1646,14 +1646,15 @@ 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-output-to-temp-buffer buffer
-        (switch-to-buffer buffer)
-        (mastodon-mode)
-        (mastodon-tl--set-buffer-spec buffer
-                                      (format "statuses/%s" id)
-                                      nil)
+      (with-current-buffer (get-buffer-create buffer)
         (let ((inhibit-read-only t))
-          (mastodon-tl--toot toot :detailed-p))))))
+          (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.
@@ -1698,13 +1699,13 @@ view all branches of a thread."
                  0)
               ;; if we have a thread:
               (progn
-                (with-output-to-temp-buffer buffer
-                  (switch-to-buffer buffer)
-                  (mastodon-mode)
-                  (mastodon-tl--set-buffer-spec buffer
-                                                endpoint
-                                                #'mastodon-tl--thread)
+                (with-current-buffer (get-buffer-create buffer)
                   (let ((inhibit-read-only t))
+                    (switch-to-buffer buffer)
+                    (mastodon-mode)
+                    (mastodon-tl--set-buffer-spec buffer
+                                                  endpoint
+                                                  #'mastodon-tl--thread)
                     (mastodon-tl--timeline (alist-get 'ancestors context))
                     (goto-char (point-max))
                     (move-marker marker (point))
@@ -1717,7 +1718,6 @@ view all branches of a thread."
             ;; else just print the lone toot:
             (mastodon-tl--single-toot id)))))))
 
-
 (defun mastodon-tl--mute-thread ()
   "Mute the thread displayed in the current buffer.
 Note that you can only (un)mute threads you have posted in."
@@ -2341,11 +2341,13 @@ INSTANCE is an instance domain name."
                        :vector)))
        (mastodon-tl--instance-response-fun response brief)))))
 
-(defun mastodon-tl--instance-response-fun (response brief)
+(defun mastodon-tl--instance-response-fun (response brief instance)
   "Display instance description RESPONSE in a new buffer.
 BRIEF means to show fewer details."
   (when response
-    (let ((buf (get-buffer-create "*mastodon-instance*")))
+    (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))
@@ -3046,43 +3048,43 @@ 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-output-to-temp-buffer 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)
-        (with-current-buffer buffer
-          (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-current-buffer (get-buffer-create buffer)
+          (let ((inhibit-read-only t))
+            (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.
@@ -3098,34 +3100,34 @@ 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-output-to-temp-buffer 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)
-    (with-current-buffer buffer
-      (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)
-        (mastodon-tl--goto-first-item)))
-    buffer))
+    (with-current-buffer (get-buffer-create buffer)
+      (let ((inhibit-read-only t))
+        (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)
+          (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 2625695..b8930b0 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1654,6 +1654,11 @@ EDIT means we are editing an existing toot, not composing a new one."
 ;;;###autoload
 (add-hook 'mastodon-toot-mode-hook #'mastodon-profile--fetch-server-account-settings-maybe)
 
+;; disable auto-fill-mode:
+(add-hook 'mastodon-toot-mode-hook
+          (lambda ()
+            (auto-fill-mode -1)))
+
 (define-minor-mode mastodon-toot-mode
   "Minor mode to capture Mastodon toots."
   :group 'mastodon-toot
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 3f57552..0c32818 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -212,6 +212,7 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (define-key map (kbd "s") #'mastodon-tl--view-scheduled-toots)
     (define-key map (kbd "M-C-q") #'mastodon-kill-all-buffers)
     (define-key map (kbd ";") #'mastodon-tl--view-instance-description)
+    (define-key map (kbd ":") #'mastodon-tl--list-followed-tags)
     (define-key map (kbd ",") #'mastodon-toot--list-toot-favouriters)
     (define-key map (kbd ".") #'mastodon-toot--list-toot-boosters)
     map)