aboutsummaryrefslogtreecommitdiff
path: root/README.org
diff options
context:
space:
mode:
authormarty hiatt <martianhiatus [a t] riseup [d o t] net>2022-08-27 11:08:57 +0200
committermarty hiatt <martianhiatus [a t] riseup [d o t] net>2022-08-27 11:08:57 +0200
commit61f742f40df98bd79337bb755ff1c30db3da8f02 (patch)
treeba32725a4ad51eac8e14aa578016d87863bcfb0a /README.org
parent0415a6cd1bd19be021c619e52d7b7fd675927cfc (diff)
parented8353064120e8941c617884c361c2cf1898e674 (diff)
Merge branch 'develop'
Diffstat (limited to 'README.org')
-rw-r--r--README.org10
1 files changed, 8 insertions, 2 deletions
diff --git a/README.org b/README.org
index 8adfe64..0be0248 100644
--- a/README.org
+++ b/README.org
@@ -175,7 +175,9 @@ Pops a new buffer/window in =mastodon-toot= minor mode. Enter the
contents of your toot here. =C-c C-c= sends the toot. =C-c C-k= cancels.
Both actions kill the buffer and window.
-Autocompletion of mentions is provided by a mastodon company backend (requires =company-mode=).
+Autocompletion of mentions and tags is provided by mastodon company backends
+(requires =company-mode= and =mastodon-toot--enable-completion= must be set to =t=)
+. Type =@= or =#= followed by two or more characters for candidates to appear.
Replies preserve visibility status/content warnings, and include boosters by default.
@@ -213,7 +215,11 @@ See =M-x customize-group RET mastodon= to view all customize options.
- Compose options:
- Default toot visibility, using =mastodon-toot--default-visibility= variable. Valid values are ="public"=, ="unlisted"=, ="private"=, or =direct=.
+<<<<<<< HEAD
- Completions for user mentions
+=======
+ - Completion for mentions and tags
+>>>>>>> develop
- Enable custom emoji
*** live-updating timelines: =mastodon-async-mode=
@@ -258,7 +264,7 @@ This version depends on the library =request= (for uploading attachments). You
can install it from MELPA, or https://github.com/tkf/emacs-request.
Optional dependencies:
-- =company= for autocompletion of mentions when composing a toot
+- =company= for autocompletion of mentions and tags when composing a toot
- =emojify= for inserting and viewing emojis
- =mpv= and =mpv.el= for viewing videos and gifs
- =lingva.el= for translating toots