branch: externals/org commit 6de5431acc8b77548e89c61a6ae0ebc1b57540bb Author: TEC <t...@tecosaur.com> Commit: TEC <t...@tecosaur.com>
org: Refactor rx to concat + regexp-opt * lisp/org.el (org--confirm-resource-safe): Since Emacs 26 doesn't support rx's (literal S) construct, use (concat (regexp-opt ...) ...) instead. --- lisp/org.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index f861cefdf2..61a21115f5 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4587,11 +4587,11 @@ returns non-nil if any of them match." (when (memq char '(?! ?f)) (customize-push-and-save 'org-safe-remote-resources - (list (rx string-start - (literal - (if (and (= char ?f) current-file) - (concat "file://" current-file) uri)) - string-end)))) + (list (concat "\\`" + (regexp-opt + (if (and (= char ?f) current-file) + (concat "file://" current-file) uri)) + "\\'")))) (prog1 (memq char '(?! ?\s ?y ?f)) (quit-window t)))))))