diff options
| author | Mattias Engdegård <mattiase@acm.org> | 2019-09-25 14:29:50 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-09-25 14:29:50 -0700 |
| commit | 2ed71227c626c6cfdc684948644ccf3d9eaeb15b (patch) | |
| tree | 2a4043ce8036206c7138b9bf5b149da8c66ec811 /lisp/emacs-lisp/re-builder.el | |
| parent | a773a6474897356cd78aeea092d2c1a51ede23f9 (diff) | |
| download | emacs-2ed71227c626c6cfdc684948644ccf3d9eaeb15b.tar.gz | |
New rx implementation
* lisp/emacs-lisp/rx.el:
* test/lisp/emacs-lisp/rx-tests.el:
* doc/lispref/searching.texi (Rx Constructs):
Rewrite rx for correctness, clarity, and performance. The new
implementation retains full compatibility and has more comprehensive
tests.
* lisp/emacs-lisp/re-builder.el (reb-rx-font-lock-keywords):
Adapt to changes in internal variables in rx.el.
Diffstat (limited to 'lisp/emacs-lisp/re-builder.el')
| -rw-r--r-- | lisp/emacs-lisp/re-builder.el | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el index 961d26a7212..1054f1453bc 100644 --- a/lisp/emacs-lisp/re-builder.el +++ b/lisp/emacs-lisp/re-builder.el @@ -816,13 +816,12 @@ If SUBEXP is non-nil mark only the corresponding sub-expressions." (require 'rx) (defconst reb-rx-font-lock-keywords - (let ((constituents (mapcar (lambda (rec) - (symbol-name (car rec))) - rx-constituents)) - (syntax (mapcar (lambda (rec) (symbol-name (car rec))) rx-syntax)) + (let ((constituents (mapcar #'symbol-name rx--builtin-forms)) + (syntax (mapcar (lambda (rec) (symbol-name (car rec))) + rx--syntax-codes)) (categories (mapcar (lambda (rec) (symbol-name (car rec))) - rx-categories))) + rx--categories))) `( (,(concat "(" (regexp-opt (list "rx-to-string") t) "[[:space:]]") (1 font-lock-function-name-face)) |