aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero <[email protected]>2006-11-19 17:49:47 +0000
committerJuanma Barranquero <[email protected]>2006-11-19 17:49:47 +0000
commit784c9f3c227e535c7e87bfbe671354fe897da8db (patch)
tree2ecd7080d6849fb848f9a7e0382b9ab1b2db732c
parent014d32b1f8a1922734b7baf1acba5a5c2edccfc5 (diff)
(regexp-opt): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/regexp-opt.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 49d1cd11bf..9a72643120 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-19 Juanma Barranquero <[email protected]>
+
+ * emacs-lisp/regexp-opt.el (regexp-opt): Doc fix.
+
2006-11-19 Micha,bk(Bl Cadilhac <[email protected]>
* 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 52cbc956bc..931ebf28bd 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.