Просмотр исходного кода

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.
TEC 2 лет назад
Родитель
Сommit
6de5431acc
1 измененных файлов с 5 добавлено и 5 удалено
  1. 5 5
      lisp/org.el

+ 5 - 5
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)))))))