aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2006-11-19 17:49:47 +0000
committerJuanma Barranquero2006-11-19 17:49:47 +0000
commit784c9f3c227e535c7e87bfbe671354fe897da8db (patch)
tree2ecd7080d6849fb848f9a7e0382b9ab1b2db732c
parent014d32b1f8a1922734b7baf1acba5a5c2edccfc5 (diff)
downloademacs-784c9f3c227e535c7e87bfbe671354fe897da8db.tar.gz
emacs-784c9f3c227e535c7e87bfbe671354fe897da8db.zip
(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 49d1cd11bf2..9a726431207 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12006-11-19 Juanma Barranquero <lekktu@gmail.com>
2
3 * emacs-lisp/regexp-opt.el (regexp-opt): Doc fix.
4
12006-11-19 Micha,bk(Bl Cadilhac <michael.cadilhac@lrde.org> 52006-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.
92Each string should be unique in STRINGS and should not contain any regexps, 92Each string should be unique in STRINGS and should not contain any regexps,
93quoted or not. If optional PAREN is non-nil, ensure that the returned regexp 93quoted or not. If optional PAREN is non-nil, ensure that the returned regexp
94is enclosed by at least one regexp grouping construct. 94is enclosed by at least one regexp grouping construct.