Merge commit 'cc8afa2b36'

Conflicts:
	module/ice-9/psyntax-pp.scm
	module/language/tree-il/peval.scm

test-suite/tests/ftw.test

@@ -169,6 +169,18 @@
 
 (with-test-prefix "scandir"
 
+  (pass-if "top-srcdir"
+    (let ((valid? (negate (cut string-any #\/ <>))))
+      (match (scandir %top-srcdir)
+        (((? valid? files) ...)
+         ;; Both subdirs and files must be included.
+         (let ((expected '("libguile" "README" "COPYING"
+                           "test-suite" "Makefile.am"
+                           "." "..")))
+           (lset= string=?
+                  (lset-intersection string=? files expected)
+                  expected))))))
+
   (pass-if "test-suite"
     (let ((select? (cut string-suffix? ".test" <>)))
       (match (scandir (string-append %test-dir "/tests") select?)

test-suite/tests/syntax.test

@@ -150,9 +150,10 @@
   (pass-if "legal (begin)"
     (eval '(begin (begin) #t) (interaction-environment)))
 
-  (pass-if-syntax-error "illegal (begin)"
-    exception:generic-syncase-error
-    (eval '(begin (if #t (begin)) #t) (interaction-environment))))
+  (if (not (include-deprecated-features))
+      (pass-if-syntax-error "illegal (begin)"
+        exception:generic-syncase-error
+        (eval '(begin (if #t (begin)) #t) (interaction-environment)))))
 
 (define-syntax matches?
   (syntax-rules (<>)

test-suite/tests/tree-il.test

@@ -1425,6 +1425,11 @@
             (((x) #f #f #f () (_))
              (call (toplevel top) (lexical x _)))))))
   
+  (pass-if-peval
+   ;; Constant folding: cons of #nil does not make list
+   (cons 1 #nil)
+   (primcall cons (const 1) (const '#nil)))
+  
   (pass-if-peval
     ;; Constant folding: cons
    (begin (cons 1 2) #f)