From 52675d282a38edcb95f7c2049b7017c7a6591e62 Mon Sep 17 00:00:00 2001 From: TEC Date: Sun, 24 Jul 2022 22:03:20 +0800 Subject: 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. (cherry picked from Org-mode commit 6de5431acc8b77548e89c61a6ae0ebc1b57540bb) --- lisp/org/org.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/org/org.el b/lisp/org/org.el index 6b796cb3147..4540761c337 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -4823,11 +4823,11 @@ org--confirm-resource-safe (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)))))))