From: Robin Templeton <robin@terpri.org>
Date: Mon, 11 Aug 2014 10:59:48 +0000 (-0400)
Subject: ignore-errors ignores scheme exceptions
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/147728721aefd0521ced92883aa1ae3e14420d68

ignore-errors ignores scheme exceptions
---

diff --git a/lisp/subr.el b/lisp/subr.el
index c6e92bf054..9d9b9270f3 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -234,7 +234,12 @@ Otherwise, return result of last form in BODY.
 See also `with-demoted-errors' that does something similar
 without silencing all errors."
   (declare (debug t) (indent 0))
-  `(condition-case nil (progn ,@body) (error nil)))
+  `(condition-case nil
+       (%funcall (@ (guile) catch)
+                 t
+                 #'(lambda () ,@body)
+                 #'(lambda (&rest args) nil))
+     (error nil)))
 
 ;;;; Basic Lisp functions.