aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/mastodon-toot.el3
-rw-r--r--lisp/mastodon.el4
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 7ff3c34..e414552 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -155,7 +155,8 @@ If the original toot visibility is different we use the more restricted one."
:type 'boolean)
(defcustom mastodon-toot--emojify-in-compose-buffer nil
- "Whether to enable `emojify' in the compose buffer.")
+ "Whether to enable `emojify' in the compose buffer."
+ :type 'boolean)
(defcustom mastodon-toot--proportional-fonts-compose nil
"Nonnil to enable using proportional fonts in the compose buffer.
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index abc7787..7a04c87 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -97,6 +97,8 @@
(autoload 'mastodon-views--view-instance-description "mastodon-views")
(autoload 'mastodon-views--view-lists "mastodon-views")
(autoload 'mastodon-views--view-scheduled-toots "mastodon-views")
+(autoload 'mastodon-tl--dm-user "mastodon-tl")
+(autoload 'mastodon-tl--scroll-up-command "mastodon-tl")
(autoload 'special-mode "simple")
(defvar mastodon-tl--highlight-current-toot)
@@ -317,7 +319,7 @@ FORCE means to fetch from the server and update
(setq mastodon-profile-credential-account
;; TODO: we should also signal a quit condition after like 5
;; secs here
- (condition-case x
+ (condition-case nil
(eval req)
(t ; req fails, return old value
mastodon-profile-credential-account)))