diff options
| -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 @@ | |||
| 1 | 2006-11-19 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * emacs-lisp/regexp-opt.el (regexp-opt): Doc fix. | ||
| 4 | |||
| 1 | 2006-11-19 Micha,bk(Bl Cadilhac <michael.cadilhac@lrde.org> | 5 | 2006-11-19 Micha,bk(Bl Cadilhac <michael.cadilhac@lrde.org> |
| 2 | 6 | ||
| 3 | * progmodes/glasses.el (glasses-separate-parentheses-exceptions): New. | 7 | * 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 @@ | |||
| 88 | 88 | ||
| 89 | ;;;###autoload | 89 | ;;;###autoload |
| 90 | (defun regexp-opt (strings &optional paren) | 90 | (defun regexp-opt (strings &optional paren) |
| 91 | "Return a regexp to match a string in STRINGS. | 91 | "Return a regexp to match a string in the list STRINGS. |
| 92 | Each string should be unique in STRINGS and should not contain any regexps, | 92 | Each string should be unique in STRINGS and should not contain any regexps, |
| 93 | quoted or not. If optional PAREN is non-nil, ensure that the returned regexp | 93 | quoted or not. If optional PAREN is non-nil, ensure that the returned regexp |
| 94 | is enclosed by at least one regexp grouping construct. | 94 | is enclosed by at least one regexp grouping construct. |