branch: elpa/fedi
commit 0967dd0f05a46c19a44863c7c7bce560b5c9eee8
Merge: 1ba7f340913 ff392e81e9c
Author: marty hiatt <[email protected]>
Commit: marty hiatt <[email protected]>
Merge branch 'dev'
---
fedi-post.el | 2 +-
fedi.el | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/fedi-post.el b/fedi-post.el
index ab3a959aba9..552022d59e6 100644
--- a/fedi-post.el
+++ b/fedi-post.el
@@ -265,8 +265,8 @@ and a status."
;; (funcall affix-fun cands))
;; FIXME: we "should" use :affixation-function for this but i
;; can't get it to work so use an exit-fun hack:
- :exit-function
:category category
+ :exit-function
(when exit-fun
(lambda (str status)
(funcall exit-fun str status)))
diff --git a/fedi.el b/fedi.el
index 2e351d2a18f..a84489ccf62 100644
--- a/fedi.el
+++ b/fedi.el
@@ -746,7 +746,7 @@ the whole likes count in order to propertize it fully."
;;; PROPERTIZING SPECIAL ITEMS
-(defun fedi-propertize-items (regex type json keymap subexp
+(defun fedi-propertize-items (regex type keymap subexp
&optional item-subexp domain-subexp link
extra-props face)
"Propertize items of TYPE matching REGEX in STR as links using JSON.
@@ -793,7 +793,8 @@ used in a link function. For an example of regexes'
subgroups, see
extra-props)))))))
(defun fedi-link-props (&optional face link item type help-echo keymap)
- "Return a plist for a link."
+ "Return a plist for a link.
+FACE LINK ITEM TYPE HELP-ECHO KEYMAP."
`(face ,(or face '(shr-text shr-link))
mouse-face highlight
shr-tab-stop t
