[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/yasnippet 5cbdbf0 8/8: Handle errors during evaluation
From: |
Stefan Monnier |
Subject: |
[elpa] externals/yasnippet 5cbdbf0 8/8: Handle errors during evaluation properly |
Date: |
Mon, 15 Mar 2021 22:25:53 -0400 (EDT) |
branch: externals/yasnippet
commit 5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6
Author: Noam Postavsky <npostavs@users.sourceforge.net>
Commit: Noam Postavsky <npostavs@users.sourceforge.net>
Handle errors during evaluation properly
* yasnippet.el (yas--eval-for-string): Convert error to a string,
rather than returning the error data (which can only lead to confusing
type errors later when code expecting a string gets a list).
* yasnippet-tests.el (yas-no-memory-of-bad-snippet): Adjust test, now
that snippet expansion swallows errors properly.
---
yasnippet-tests.el | 2 +-
yasnippet.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index e009a72..b8a7980 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -847,7 +847,7 @@ mapconcat #'(lambda (arg)
;; See https://github.com/joaotavora/yasnippet/issues/800.
(with-temp-buffer
(yas-minor-mode 1)
- (should-error (yas-expand-snippet "```foo\n\n```"))
+ (yas-expand-snippet "```foo\n\n```")
(erase-buffer) ; Bad snippet may leave wrong text.
;; But expanding the corrected snippet should work fine.
(yas-expand-snippet "\\`\\`\\`foo\n\n\\`\\`\\`")
diff --git a/yasnippet.el b/yasnippet.el
index fe29fc9..78ef38a 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1505,7 +1505,7 @@ Also tries to work around Emacs Bug#30931."
(let ((result (eval form)))
(when result
(format "%s" result))))))
- ((debug error) (cdr oops)))))
+ ((debug error) (error-message-string oops)))))
(defun yas--eval-for-effect (form)
(yas--safely-call-fun (apply-partially #'eval form)))
- [elpa] externals/yasnippet updated (3bf9a3b -> 5cbdbf0), Stefan Monnier, 2021/03/15
- [elpa] externals/yasnippet 5b1217a 6/8: ; Add some notes about narrowing, font-lock cc-mode issues, Stefan Monnier, 2021/03/15
- [elpa] externals/yasnippet 1cc1996 5/8: Don't bind inhibit-modification-hooks in yas--snippet-create, Stefan Monnier, 2021/03/15
- [elpa] externals/yasnippet d3d6d70 7/8: Correct manual call to after-change-functions, Stefan Monnier, 2021/03/15
- [elpa] externals/yasnippet 291873e 4/8: ; .travis.yml: Clean up validator warnings/infos, Stefan Monnier, 2021/03/15
- [elpa] externals/yasnippet ac03c2f 1/8: ; Test on Emacs 27, Stefan Monnier, 2021/03/15
- [elpa] externals/yasnippet 170d13d 3/8: Scan nested fields properly, Stefan Monnier, 2021/03/15
- [elpa] externals/yasnippet 7c02bc1 2/8: Fix failure on depth 2+ nested snippets, Stefan Monnier, 2021/03/15
- [elpa] externals/yasnippet 5cbdbf0 8/8: Handle errors during evaluation properly,
Stefan Monnier <=