diff options
| author | Kenichi Handa <handa@m17n.org> | 2010-09-07 20:22:15 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2010-09-07 20:22:15 +0900 |
| commit | 439dcbc16bd3d4fcef87736fe84173de6af4cf2e (patch) | |
| tree | 2e3cff07e60db016e7de14833432590a1a18ea7a /lisp/emacs-lisp | |
| parent | 396475b7c1ae2e1a5b1d4be68e6b5b0819a7695b (diff) | |
| parent | 9c405a86c6d6ee1034252d653c246ef509145000 (diff) | |
| download | emacs-439dcbc16bd3d4fcef87736fe84173de6af4cf2e.tar.gz emacs-439dcbc16bd3d4fcef87736fe84173de6af4cf2e.tar.bz2 emacs-439dcbc16bd3d4fcef87736fe84173de6af4cf2e.zip | |
merge emacs-23
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/rx.el | 7 |
1 files changed, 5 insertions, 2 deletions
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))) |