Merge branch 'develop'

1 files changed, 12 insertions, 1 deletions

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 864d767..654918c 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -50,6 +50,7 @@
 (defvar mastodon-tl--buffer-spec)
 (defvar mastodon-tl--enable-proportional-fonts)
 (defvar mastodon-profile-account-settings)
+(defvar mastodon-profile-acccount-preferences-data)
 
 (autoload 'iso8601-parse "iso8601")
 (autoload 'mastodon-auth--user-acct "mastodon-auth")
@@ -92,6 +93,8 @@
 (autoload 'mastodon-views--view-scheduled-toots "mastodon-views")
 (autoload 'org-read-date "org")
 (autoload 'mastodon-tl--toot-or-base "mastodon-tl")
+(autoload 'mastodon-profile--get-source-value "mastodon-toot")
+(autoload 'mastodon-tl--get-buffer-type "mastodon-tl")
 
 ;; for mastodon-toot--translate-toot-text
 (autoload 'mastodon-tl--content "mastodon-tl")
@@ -1878,11 +1881,19 @@ EDIT means we are editing an existing toot, not composing a new one."
     (switch-to-buffer-other-window buffer)
     (text-mode)
     (mastodon-toot-mode t)
+    ;; set visibility:
     (setq mastodon-toot--visibility
           (or (plist-get mastodon-profile-account-settings 'privacy)
               ;; use toot visibility setting from the server:
-              (mastodon-profile--get-source-pref 'privacy)
+              (mastodon-profile--get-source-value 'privacy)
               "public")) ; fallback
+    ;; default language:
+    ;; NB: this is not necessarily set in
+    ;; `mastodon-profile-credential-account' nor in
+    ;; `mastodon-profile-account-settings'!
+    (setq mastodon-toot--language
+          (mastodon-profile--get-preferences-pref 'posting:default:language))
+    ;; display original toot:
     (if mastodon-toot-display-orig-in-reply-buffer
         (progn
           (mastodon-toot--display-docs-and-status-fields reply-text)