Merge branch 'master' of git@github.com:mzp/scheme-abc

diff --cc src/lisp.ml
index 56949f6,74e7d30..5f62c0a
--- 1/src/lisp.ml
--- 2/src/lisp.ml
+++ b/src/lisp.ml
@@@ -1,12 -1,14 +1,13 @@@
  open Base
  open Sexp
  open ClosTrans
 -open Parsec
  
 -exception Syntax_error
 +exception Syntax_error of string
  
- let symbol = function
-     Symbol n -> n
-   | _ -> failwith "expected symbol"
+ let symbol = 
+   function
+       Symbol n -> n
+     | _ -> failwith "expected symbol"
  
  let qname symbol =
    try