aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/rx.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dd0e5d17100..2dc82bf403e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-06-30 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * emacs-lisp/rx.el (rx-constituents): Fix up `anything'.
4
12007-06-29 Juanma Barranquero <lekktu@gmail.com> 52007-06-29 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * generic-x.el (generic-define-mswindows-modes) 7 * generic-x.el (generic-define-mswindows-modes)
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index 54f88ba3ea5..6caa77220bb 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -120,7 +120,7 @@
120 (| . or) ; SRE 120 (| . or) ; SRE
121 (not-newline . ".") 121 (not-newline . ".")
122 (nonl . not-newline) ; SRE 122 (nonl . not-newline) ; SRE
123 (anything . ".\\|\n") 123 (anything . "\\(?:.\\|\n\\)")
124 (any . (rx-any 1 nil rx-check-any)) ; inconsistent with SRE 124 (any . (rx-any 1 nil rx-check-any)) ; inconsistent with SRE
125 (in . any) 125 (in . any)
126 (char . any) ; sregex 126 (char . any) ; sregex