[elpa] master 203df22 22/63: Use debug-on-error to simplify error handling

[Noam Postavsky]

branch: master
commit 203df22e26ac6fd5b1ad8aee3c2b4e5c0b57071d
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>

    Use debug-on-error to simplify error handling
    
    * yasnippet.el (yas--eval-for-string, yas--safely-run-hook: Let-bind
    `debug-on-error' according to `yas-good-grace' and add `debug' to
    condition handler to deduplicate evaluation.
---
 yasnippet.el | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 4258d14..7645c19 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1332,20 +1332,17 @@ Returns (TEMPLATES START END). This function respects
 
 (defun yas--eval-for-string (form)
   "Evaluate FORM and convert the result to string."
-  (let ((eval-saving-stuff
-         (lambda (form)
-           (save-excursion
-             (save-restriction
-               (save-match-data
-                 (widen)
-                 (let ((result (eval form)))
-                   (when result
-                     (format "%s" result)))))))))
-    (if (memq yas-good-grace '(t inline))
-        (condition-case oops
-            (funcall eval-saving-stuff form)
-          (error (cdr oops)))
-      (funcall eval-saving-stuff form))))
+  (let ((debug-on-error (and (not (memq yas-good-grace '(t inline)))
+                             debug-on-error)))
+    (condition-case oops
+        (save-excursion
+          (save-restriction
+            (save-match-data
+              (widen)
+              (let ((result (eval form)))
+                (when result
+                  (format "%s" result))))))
+      ((debug error) (cdr oops)))))
 
 (defun yas--eval-for-effect (form)
   ;; FIXME: simulating lexical-binding.
@@ -3334,15 +3331,14 @@ This renders the snippet as ordinary text."
   (setq yas--snippets-to-move nil))
 
 (defun yas--safely-run-hook (hook)
-  (let ((run-the-hook (lambda (hook) (funcall hook))))
-    (if (memq yas-good-grace '(t hooks))
-        (funcall run-the-hook hook)
-      (condition-case error
-          (funcall run-the-hook hook)
-        (error
-         (yas--message 2 "Error running %s: %s"
-                       (if (symbolp hook) hook "a hook")
-                       (error-message-string error)))))))
+  (let ((debug-on-error (and (not (memq yas-good-grace '(t hooks)))
+                             debug-on-error)))
+    (condition-case error
+        (funcall hook)
+      ((debug error)
+       (yas--message 2 "Error running %s: %s"
+                     (if (symbolp hook) hook "a hook")
+                     (error-message-string error))))))
 
 
 (defun yas--check-commit-snippet ()