diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/regexp-opt.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 49d1cd11bf2..9a726431207 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2006-11-19 Juanma Barranquero <lekktu@gmail.com> + + * emacs-lisp/regexp-opt.el (regexp-opt): Doc fix. + 2006-11-19 Micha,bk(Bl Cadilhac <michael.cadilhac@lrde.org> * progmodes/glasses.el (glasses-separate-parentheses-exceptions): New. diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el index 52cbc956bc3..931ebf28bd2 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. |