diff options
| author | Leo Liu | 2010-06-29 14:09:07 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-06-29 14:09:07 +0200 |
| commit | a354ac6a0cffe3c2425bc272c64041aac9d0e2dd (patch) | |
| tree | 9167503bfe306e754578db1c6cb3a15274076382 | |
| parent | b6f9df0f5ddfe75b141d8864b16343262403aa43 (diff) | |
| download | emacs-a354ac6a0cffe3c2425bc272c64041aac9d0e2dd.tar.gz emacs-a354ac6a0cffe3c2425bc272c64041aac9d0e2dd.zip | |
emacs-lisp/rx.el (rx): Doc fix. (Bug#6537)
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/rx.el | 3 |
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 @@ | |||
| 1 | 2010-06-29 Leo <sdl.web@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * emacs-lisp/rx.el (rx): Doc fix. (Bug#6537) | ||
| 4 | |||
| 1 | 2010-06-27 Oleksandr Gavenko <gavenkoa@gmail.com> (tiny change) | 5 | 2010-06-27 Oleksandr Gavenko <gavenkoa@gmail.com> (tiny change) |
| 2 | 6 | ||
| 3 | * generic-x.el (bat-generic-mode): Fix regexp for command line | 7 | * 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 | |||
| 1053 | like `and', but makes the match accessible with `match-end', | 1053 | like `and', but makes the match accessible with `match-end', |
| 1054 | `match-beginning', and `match-string'. | 1054 | `match-beginning', and `match-string'. |
| 1055 | 1055 | ||
| 1056 | `(group SEXP1 SEXP2 ...)' | ||
| 1057 | another name for `submatch'. | ||
| 1058 | |||
| 1059 | `(or SEXP1 SEXP2 ...)' | 1056 | `(or SEXP1 SEXP2 ...)' |
| 1060 | `(| SEXP1 SEXP2 ...)' | 1057 | `(| SEXP1 SEXP2 ...)' |
| 1061 | matches anything that matches SEXP1 or SEXP2, etc. If all | 1058 | matches anything that matches SEXP1 or SEXP2, etc. If all |