* 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

2 files changed, 11 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea973172b3a..21eaa4c15d3 100644
--- 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 85fe3514b01..522d452c2dc 100644
--- 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)))