* emacs-lisp/rx.el (rx-any): Don't explode ranges that end in - or ].

(rx-any-condense-range): Explode 2-char ranges.

Fixes: debbugs:6984

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea973172b3a606f5c9cbe5a5d913ed7bba476240..21eaa4c15d3a5d890080433dbdb92cc34a7ef15e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/rx.el (rx-any): Don't explode ranges that end in special
+       chars like - or ] (bug#6984).
+       (rx-any-condense-range): Explode 2-char ranges.
+
 2010-09-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * textmodes/bibtex.el:

diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index 85fe3514b01a194522bc58b128254b7955ccd40e..522d452c2dc7c05a6699781a6c15a4ba463d534c 100644 (file)
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -427,7 +427,7 @@ Only both edges of each range is checked."
            (mapcar (lambda (e)
                      (cond
                       ((= (car e) (cdr e)) (list (car e)))
-                      ;; ((= (1+ (car e)) (cdr e)) (list (car e) (cdr e)))
+                      ((= (1+ (car e)) (cdr e)) (list (car e) (cdr e)))
                       ((list e))))
                    l))
      (delete-dups str))))
@@ -545,7 +545,10 @@ ARG is optional."
                            ((numberp e) (string e))
                            ((consp e)
                             (if (and (= (1+ (car e)) (cdr e))
-                                     (null (memq (car e) '(?\] ?-))))
+                                      ;; rx-any-condense-range should
+                                      ;; prevent this case from happening.
+                                     (null (memq (car e) '(?\] ?-)))
+                                      (null (memq (cdr e) '(?\] ?-))))
                                 (string (car e) (cdr e))
                               (string (car e) ?- (cdr e))))
                            (e)))