diff options
| author | marty hiatt <martianhiatus@riseup.net> | 2024-05-27 19:51:51 +0200 |
|---|---|---|
| committer | marty hiatt <martianhiatus@riseup.net> | 2024-05-27 19:51:51 +0200 |
| commit | 476268af7d78d3136d6d6bf11856d0c0d6fd1c7a (patch) | |
| tree | b4c4eace33d293f5f511280ee0a11005a80c4980 /lisp/mastodon-toot.el | |
| parent | 49def07b3d9b6f0718ef9402a3808ca01557245e (diff) | |
| parent | 4c3bdb30b8d0238e8b5900a42938d865e7dc407f (diff) | |
Merge branch 'develop'
Diffstat (limited to 'lisp/mastodon-toot.el')
| -rw-r--r-- | lisp/mastodon-toot.el | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el index aff201d..864d767 100644 --- a/lisp/mastodon-toot.el +++ b/lisp/mastodon-toot.el @@ -912,7 +912,15 @@ instance to edit a toot." (mastodon-views--cancel-scheduled-toot scheduled-id :no-confirm)) (mastodon-toot--restore-previous-window-config prev-window-config) - (when edit-id + ;; reload previous view in certain cases: + ;; we reload: - when we have been editing + ;; - when we are in thread view + ;; - ? + ;; (we don't necessarily want to reload in every posting case + ;; as it can sometimes be slow and we may still lose our place + ;; in a timeline.) + (when (or edit-id + (equal 'thread (mastodon-tl--get-buffer-type))) (let ((pos (marker-position (cadr prev-window-config)))) (mastodon-tl--reload-timeline-or-profile pos)))))))))) @@ -1133,7 +1141,7 @@ arg, a candidate." (cadr (assoc candidate mastodon-toot-completions))) (defun mastodon-toot--emoji-annotation-fun (candidate) - "." + "CANDIDATE." ;; TODO: emoji image as annot (cdr (assoc candidate mastodon-toot-completions))) |