Mercurial > emacs
diff lisp/emacs-lisp/regexp-opt.el @ 111047:1e7d8f405703
Merge changes from emacs-23 branch.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Tue, 19 Oct 2010 13:44:07 +0200 |
parents | 37b955157790 2e8109ba205d |
children | 417b1e4d63cd |
line wrap: on
line diff
--- a/lisp/emacs-lisp/regexp-opt.el Tue Oct 19 11:50:07 2010 +0200 +++ b/lisp/emacs-lisp/regexp-opt.el Tue Oct 19 13:44:07 2010 +0200 @@ -141,11 +141,10 @@ (require 'cl)) (defun regexp-opt-group (strings &optional paren lax) - ;; Return a regexp to match a string in the sorted list STRINGS. - ;; If PAREN non-nil, output regexp parentheses around returned regexp. - ;; If LAX non-nil, don't output parentheses if it doesn't require them. - ;; Merges keywords to avoid backtracking in Emacs' regexp matcher. - + "Return a regexp to match a string in the sorted list STRINGS. +If PAREN non-nil, output regexp parentheses around returned regexp. +If LAX non-nil, don't output parentheses if it doesn't require them. +Merges keywords to avoid backtracking in Emacs' regexp matcher." ;; The basic idea is to find the shortest common prefix or suffix, remove it ;; and recurse. If there is no prefix, we divide the list into two so that ;; \(at least) one half will have at least a one-character common prefix. @@ -239,9 +238,7 @@ (defun regexp-opt-charset (chars) - ;; - ;; Return a regexp to match a character in CHARS. - ;; + "Return a regexp to match a character in CHARS." ;; The basic idea is to find character ranges. Also we take care in the ;; position of character set meta characters in the character set regexp. ;;