branch: externals/ement
commit 23b44d9e117cc1a3d10240411804c918674528d1
Author: Phil Sainty <p...@catalyst.net.nz>
Commit: Adam Porter <a...@alphapapa.net>
Fix: (ement-room-mode) browse-url compatibility for Emacs<28
If `browse-url-handlers' is not defined then fall back to using
`browse-url-browser-function'.
Fixes #90.
---
ement-room.el | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/ement-room.el b/ement-room.el
index 30f025d6f9..a86efcf62f 100644
--- a/ement-room.el
+++ b/ement-room.el
@@ -1917,11 +1917,17 @@ and erases the buffer."
imenu-create-index-function #'ement-room--imenu-create-index-function
;; TODO: Use EWOC header/footer for, e.g. typing messages.
ement-ewoc (ewoc-create #'ement-room--pp-thing))
- (when (boundp 'browse-url-handlers)
- ;; NOTE: This variable was added in Emacs 28.1. In earlier versions,
these links
- ;; won't work within Ement.
- (setq-local browse-url-handlers (cons (cons
ement-room-matrix.to-url-regexp #'ement-room-browse-url)
- browse-url-handlers)))
+ ;; Set the URL handler. Note that `browse-url-handlers' was added in 28.1;
+ ;; prior to that `browse-url-browser-function' served double-duty.
+ (let ((handler (cons ement-room-matrix.to-url-regexp
#'ement-room-browse-url)))
+ (if (boundp 'browse-url-handlers)
+ (setq-local browse-url-handlers (cons handler browse-url-handlers))
+ (setq-local browse-url-browser-function
+ (cons handler
+ (if (consp browse-url-browser-function)
+ browse-url-browser-function
+ (and browse-url-browser-function
+ (list (cons "."
browse-url-browser-function))))))))
(setq-local completion-at-point-functions
'(ement-room--complete-members-at-point
ement-room--complete-rooms-at-point))
(setq-local dnd-protocol-alist (append '(("^file:///" .
ement-room-dnd-upload-file)
