summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorLeo Liu <sdl.web@gmail.com>2010-06-29 14:09:07 +0200
committerJuanma Barranquero <lekktu@gmail.com>2010-06-29 14:09:07 +0200
commita354ac6a0cffe3c2425bc272c64041aac9d0e2dd (patch)
tree9167503bfe306e754578db1c6cb3a15274076382 /lisp
parentb6f9df0f5ddfe75b141d8864b16343262403aa43 (diff)
downloademacs-a354ac6a0cffe3c2425bc272c64041aac9d0e2dd.tar.gz
emacs-lisp/rx.el (rx): Doc fix. (Bug#6537)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/rx.el3
2 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bda792cfc0..540ab2f0d99 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-29 Leo <sdl.web@gmail.com> (tiny change)
+
+ * emacs-lisp/rx.el (rx): Doc fix. (Bug#6537)
+
2010-06-27 Oleksandr Gavenko <gavenkoa@gmail.com> (tiny change)
* generic-x.el (bat-generic-mode): Fix regexp for command line
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index 5d04494ecb6..85fe3514b01 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -1053,9 +1053,6 @@ CHAR
like `and', but makes the match accessible with `match-end',
`match-beginning', and `match-string'.
-`(group SEXP1 SEXP2 ...)'
- another name for `submatch'.
-
`(or SEXP1 SEXP2 ...)'
`(| SEXP1 SEXP2 ...)'
matches anything that matches SEXP1 or SEXP2, etc. If all