aboutsummaryrefslogtreecommitdiff
path: root/lisp/mastodon.el
diff options
context:
space:
mode:
authormarty hiatt <martianhiatus [a t] riseup [d o t] net>2023-05-11 09:53:25 +0200
committermarty hiatt <martianhiatus [a t] riseup [d o t] net>2023-05-11 09:53:25 +0200
commitc7779e8e8ad172be64aa98ee62a83b54185e3bce (patch)
tree3cbc9138471768ac9ff0c51b53df20acc5cc6949 /lisp/mastodon.el
parentebb44f398037c3bd6aca1c85799ed353c44e9c3d (diff)
parentb19390cd38ba93e527e5961723b46779749f1ee1 (diff)
Merge branch 'audit' into develop
Diffstat (limited to 'lisp/mastodon.el')
-rw-r--r--lisp/mastodon.el15
1 files changed, 5 insertions, 10 deletions
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 21bd763..8b76320 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -306,11 +306,10 @@ from the server and load anew."
(progn (switch-to-buffer buffer)
(mastodon-tl--update))
(message "Loading your notifications...")
- (mastodon-tl--init-sync
- (or buffer-name "notifications")
- "notifications"
- 'mastodon-notifications--timeline
- type)
+ (mastodon-tl--init-sync (or buffer-name "notifications")
+ "notifications"
+ 'mastodon-notifications--timeline
+ type)
(with-current-buffer buffer
(use-local-map mastodon-notifications--map)))))
@@ -329,11 +328,7 @@ not, just browse the URL in the normal fashion."
(mastodon-tl--property 'shr-url :no-move)
(read-string "Lookup URL: "))))
(if (not (mastodon--masto-url-p query))
- ;; this doesn't work as shr-browse-url doesn't take a url arg
- ;; and with no args it can't use our read-string query, but only
- ;; looks for a url at point
- ;; (if (equal major-mode 'mastodon-mode)
- ;; (shr-browse-url query) ;; keep our shr keymap
+ ;; (shr-browse-url query) ; doesn't work (keep our shr keymap)
(browse-url query)
(message "Performing lookup...")
(let* ((url (format "%s/api/v2/search" mastodon-instance-url))