diff options
| author | mousebot <mousebot@riseup.net> | 2022-01-11 22:55:51 +0100 |
|---|---|---|
| committer | mousebot <mousebot@riseup.net> | 2022-01-11 22:55:51 +0100 |
| commit | 6113fa77d1cceb5bfe06d016dc2c81850c4b498e (patch) | |
| tree | 4507ee59324ad767c7ff6c35b9256ee2e6356cbd | |
| parent | ef10fe596e394dac16d23df893d91e7d68989ffc (diff) | |
| parent | c6b613a65bb796f89bf7b46f4dace53f97ce392f (diff) | |
Merge branch 'develop'
| -rw-r--r-- | lisp/mastodon-notifications.el | 5 | ||||
| -rw-r--r-- | lisp/mastodon-tl.el | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el index 9444658..1361099 100644 --- a/lisp/mastodon-notifications.el +++ b/lisp/mastodon-notifications.el @@ -48,6 +48,7 @@ (autoload 'mastodon-tl--spoiler "mastodon-tl.el") (autoload 'mastodon-tl--toot-id "mastodon-tl.el") (defvar mastodon-tl--display-media-p) +(defvar mastodon-tl--buffer-spec) (defvar mastodon-notifications--types-alist '(("mention" . mastodon-notifications--mention) @@ -174,8 +175,8 @@ Status notifications are given when (propertize (if (equal type 'follow) "Congratulations, you have a new follower!" (format "You have a follow request from... %s" - follower) - 'face 'default)) + follower)) + 'face 'default) (mastodon-tl--clean-tabs-and-nl (if (mastodon-tl--has-spoiler status) (mastodon-tl--spoiler status) diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el index 0e3de0e..cd27bd5 100644 --- a/lisp/mastodon-tl.el +++ b/lisp/mastodon-tl.el @@ -492,8 +492,6 @@ START and END are the boundaries of the link in the toot." mastodon-instance-url)) (maybe-hashtag (mastodon-tl--extract-hashtag-from-url url toot-instance-url)) - (url-instance (concat "https://" - (url-host (url-generic-parse-url url)))) (maybe-userhandle (mastodon-tl--extract-userhandle-from-url url (buffer-substring-no-properties start end)))) (cond (;; Hashtags: |