Major bug in cond, didn't support nil as actual expression to evaluat…

…e on match.
hraberg · Mar 11, 2013 · f55777b · f55777b
1 parent 31be044
commit f55777b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/deuce/emacs/print.clj b/src/deuce/emacs/print.clj
@@ -146,7 +146,8 @@
 (defun terpri (&optional printcharfun)
   "Output a newline to stream PRINTCHARFUN.
   If PRINTCHARFUN is omitted or nil, the value of `standard-output' is used."
-  )
+  (println)
+  true)
 
 (defun prin1-to-string (object &optional noescape)
   "Return a string containing the printed representation of OBJECT.

diff --git a/src/deuce/emacs_lisp.clj b/src/deuce/emacs_lisp.clj
@@ -443,7 +443,7 @@
   `(c/cond
      ~@(->> clauses
             (map #(do [`(not-null? ~(el->clj (first %)))
-                       (if (second %) `(progn ~@(rest %)) (el->clj (first %)))]))
+                       (if (= 1 (count %)) (el->clj (first %)) `(progn ~@(rest %)))]))
             (apply concat))))
 
 (c/defmacro setq-helper* [default? sym-vals]