diff options
| author | Miles Bader <miles@gnu.org> | 2006-11-21 08:56:38 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-11-21 08:56:38 +0000 |
| commit | eeb7eaa88482114822730380196f4e7a3c0870dd (patch) | |
| tree | e8c3861b628ad53c6b8f158b74d1be8bd8590aeb /lisp/emacs-lisp/regexp-opt.el | |
| parent | b15d6f4265b10fbc413caca03246feff9c87d53e (diff) | |
| parent | a98d0b8e8948293de119c4cdd7a8c79318ad82fa (diff) | |
| download | emacs-eeb7eaa88482114822730380196f4e7a3c0870dd.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 505-522)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: etc/TUTORIAL.cn: Updated.
- Merge from erc--emacs--22
* gnus--rel--5.10 (patch 164-167)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-137
Diffstat (limited to 'lisp/emacs-lisp/regexp-opt.el')
| -rw-r--r-- | lisp/emacs-lisp/regexp-opt.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el index c2e13be20d8..ab242af3ac3 100644 --- a/lisp/emacs-lisp/regexp-opt.el +++ b/lisp/emacs-lisp/regexp-opt.el @@ -88,7 +88,7 @@ ;;;###autoload (defun regexp-opt (strings &optional paren) - "Return a regexp to match a string in STRINGS. + "Return a regexp to match a string in the list STRINGS. Each string should be unique in STRINGS and should not contain any regexps, quoted or not. If optional PAREN is non-nil, ensure that the returned regexp is enclosed by at least one regexp grouping construct. |