(regexp-opt-depth): Fix off-by-two error.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 828068349b2987a888d507c6cd2dfa3f51e135a0..ecd695e684f047b3449064aec04d305099225f27 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,14 +1,18 @@
+2001-11-27  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * emacs-lisp/regexp-opt.el (regexp-opt-depth): Fix off-by-two error.
+
 2001-11-21  Richard M. Stallman  <rms@gnu.org>
 
-       * files.el (temporary-file-directory, null-device) 
+       * files.el (temporary-file-directory, null-device)
        (small-temporary-file-directory): Definitions moved up.
 
        * international/encoded-kb.el: Don't alter minor-mode-alist.
 
 2001-11-20  Kai Grossjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
-        * files.el (auto-save-file-name-transforms): Put remote files in
-        temporary-file-directory rather than /tmp.
+       * files.el (auto-save-file-name-transforms): Put remote files in
+       temporary-file-directory rather than /tmp.
 
 2001-11-20  Stefan Monnier  <monnier@cs.yale.edu>
 

diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index b6fac1355c1c141ef24c8fd477051819d21902f1..894cc4c4be7f9fafadef957812223e3768b30e40 100644 (file)
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -120,7 +120,9 @@ in REGEXP."
     (let ((count 0) start)
       (while (string-match "\\(\\`\\|[^\\]\\)\\\\\\(\\\\\\\\\\)*([^?]"
                           regexp start)
-       (setq count (1+ count) start (match-end 0)))
+       (setq count (1+ count)
+             ;; Go back 2 chars (one for [^?] and one for [^\\]).
+             start (- (match-end 0) 2))
       count)))
 \f
 ;;; Workhorse functions.