Hi, The attached patch defines special indentation for a few more special Scheme forms: and-let*, with-syntax, eval-when, and the pattern matching family (match, match-lambda, match-let, etc.). I didn't do copyright assignment, assuming that the patch is trivial enough, but let me know if this would be desirable. Best regards, Jean