Syncing on up, hopefully fixing the macro stepper in the process (but perhaps

not).

svn: r13104

collects/2htdp/test/world0-stops.ss

@@ -2,4 +2,4 @@
 ;; about the language level of this file in a form that our tools can easily process.
 #reader(lib "htdp-intermediate-lambda-reader.ss" "lang")((modname world0-stops) (read-case-sensitive #t) (teachpacks ((lib "universe.ss" "teachpack" "2htdp"))) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ((lib "universe.ss" "teachpack" "2htdp")))))
 
-(big-bang 0 (stop-when zero?) (on-tick add1))
+(big-bang 0 (stop-when zero?) (on-tick add1))

collects/framework/private/editor.ss

@@ -158,7 +158,7 @@
       
       (inherit refresh-delayed? 
                get-canvas
-               get-max-width get-admin)
+               get-admin)
       
       (define/augment (can-save-file? filename format)
         (and (if (equal? filename (get-filename))

collects/redex/private/matcher-test.ss

@@ -442,6 +442,11 @@
                 '(+ 1 b)
                 #f)
     
+    (test-empty `(side-condition ((any_1 ..._a) (any_2 ..._a))
+                                 ,(lambda (bindings) (error 'should-not-be-called)))
+                '((1 2 3) (4 5))
+                #f)
+    
     (test-xab 'exp_1
               '(+ 1 2)
               (list (make-test-mtch (make-bindings (list (make-bind 'exp_1 '(+ 1 2)))) '(+ 1 2) none)))

collects/redex/private/matcher.ss

@@ -758,7 +758,8 @@ before the pattern compiler is invoked.
           (lambda (exp hole-info)
             (let ([matches (match-pat exp hole-info)])
               (and matches
-                   (let ([filtered (filter (λ (m) (condition (mtch-bindings m))) matches)])
+                   (let ([filtered (filter (λ (m) (condition (mtch-bindings m))) 
+                                           (filter-multiples matches))])
                      (if (null? filtered)
                          #f
                          filtered)))))

collects/teachpack/door.ss

@@ -56,4 +56,4 @@
   l4)
 
 (fsa "locked" "closed" "open" "unlock" "lock" "push" "time")
-(fsa "'locked" "'closed" "'open" "#\\u" "#\\l" "#\\space" "tick")
+(fsa "'locked" "'closed" "'open" "#\\u" "#\\l" "#\\space" "tick")