Merge commit 'cc8afa2b36'

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

module/ice-9/ftw.scm

@@ -530,7 +530,7 @@ of file names is sorted according to ENTRY<?, which defaults to
 
   (define (skip name stat result)
     ;; All the sub-directories are skipped.
-    result)
+    (cons (basename name) result))
 
   (and=> (file-system-fold enter? leaf down up skip #f name stat)
          (lambda (files)

module/ice-9/psyntax.scm

@@ -1319,7 +1319,12 @@
           ((call) (expand-call (expand (car e) r w mod) e r w s mod))
           ((begin-form)
            (syntax-case e ()
-             ((_ e1 e2 ...) (expand-sequence #'(e1 e2 ...) r w s mod))))
+             ((_ e1 e2 ...) (expand-sequence #'(e1 e2 ...) r w s mod))
+             ((_)
+              (begin
+                (issue-deprecation-warning
+                 "Sequences of zero expressions are deprecated.  Use *unspecified*.")
+                (expand-void)))))
           ((local-syntax-form)
            (expand-local-syntax value e r w s mod expand-sequence))
           ((eval-when-form)

module/language/tree-il/peval.scm

@@ -1,6 +1,6 @@
 ;;; Tree-IL partial evaluator
 
-;; Copyright (C) 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2012 Free Software Foundation, Inc.
 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -1032,7 +1032,7 @@ top-level bindings from ENV and return the resulting expression."
            (for-tail (list->seq src (append args (list res))))))
         (else
          (match (cons name (map for-value args))
-           (('cons x ($ <const> _ ()))
+           (('cons x ($ <const> _ (? (cut eq? <> '()))))
             (make-primcall src 'list (list x)))
            (('cons x ($ <primcall> _ 'list elts))
             (make-primcall src 'list (cons x elts)))