Merge branch 'develop' into unread-notifs

1 files changed, 4 insertions, 9 deletions

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 8dfee74..9aeb790 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1673,7 +1673,7 @@ REPLY-TEXT is the text of the toot being replied to."
        'read-only "Edit your message below."
        'toot-post-header t))
      ;; allow us to enter text after read-only header:
-     (propertize "\n"
+     (propertize "\n\n"
                  'rear-nonsticky t))))
 
 (defun mastodon-toot--most-restrictive-visibility (reply-visibility)
@@ -1686,22 +1686,17 @@ The default is given by `mastodon-toot--default-reply-visibility'."
 	  mastodon-toot--default-reply-visibility
         reply-visibility))))
 
-(defun mastodon-toot--fill-buffer ()
-  "Mark buffer, call `fill-region'."
-  (mark-whole-buffer) ; lisp code should not set mark
-  ;; (fill-region (point-min) (point-max)) ; but this doesn't work
-  (fill-region (region-beginning) (region-end)))
-
 (defun mastodon-toot--render-reply-region-str (str)
   "Refill STR and prefix all lines with >, as reply-quote text."
   (with-temp-buffer
     (insert str)
     ;; unfill first:
     (let ((fill-column (point-max)))
-      (mastodon-toot--fill-buffer))
+      (fill-region (point-min) (point-max)))
     ;; then fill:
-    (mastodon-toot--fill-buffer)
+    (fill-region (point-min) (point-max))
     ;; add our own prefix, pauschal:
+    (goto-char (point-min))
     (save-match-data
       (while (re-search-forward "^" nil t)
         (replace-match " > ")))