From 03457960228d2ccbb59602ef041dde6a1eb18d65 Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Sat, 5 Oct 2024 22:07:11 -0400 Subject: [PATCH] Simplify xref regular expression with rx * lisp/progmodes/xref.el (xref--regexp-to-extended): switch to rx regular expression for legibility (cherry picked from commit 500f5da5fb62cd0bbded8df754d93e3147d1d847) --- lisp/progmodes/xref.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 42a6befc907..221b715d850 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -2156,7 +2156,8 @@ directory, used as the root of the ignore globs." (replace-regexp-in-string ;; FIXME: Add tests. Move to subr.el, make a public function. ;; Maybe error on Emacs-only constructs. - "\\(?:\\\\\\\\\\)*\\(?:\\\\[][]\\)?\\(?:\\[.+?\\]\\|\\(\\\\?[(){}|]\\)\\)" + (rx (zero-or-more "\\\\") (opt "\\" (any "[]")) + (or (seq "[" (+? nonl) "]") (group (opt "\\") (any "(){|}")))) (lambda (str) (cond ((not (match-beginning 1)) -- 2.39.5