From 475cc6b8d225078b3a03f3e8d39258dcaccf9b2c Mon Sep 17 00:00:00 2001 From: Nathan Lovato Date: Wed, 25 Mar 2020 07:31:44 -0600 Subject: [PATCH] Avoid overriding the user's 'rx macro --- gdscript-rx.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdscript-rx.el b/gdscript-rx.el index 8290f3d..4193b06 100644 --- a/gdscript-rx.el +++ b/gdscript-rx.el @@ -1159,7 +1159,7 @@ For extending the `rx' notation in FORM, use `gdscript-rx-define' or `gdscript-r ;;;###autoload -(defmacro rx (&rest regexps) +(defmacro gdscript-rx-build-rx (&rest regexps) "Translate regex REGEXPS in sexp form to a regexp string. Each argument is one of the forms below; RX is a subform, and RX... stands for zero or more RXs. For details, see Info @@ -1481,7 +1481,7 @@ This variant of `rx' supports common Gdscript named REGEXPS." (* ?\\ ?\\) ;; Match single or triple quotes of any kind. (group (or "\"\"\"" "\"" "'''" "'"))))) - (rx ,@regexps))) + (gdscript-rx-build-rx ,@regexps))) (provide 'gdscript-rx)