[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master a80033d 115/177: Refactor yas-good-grace error handling
From: |
João Távora |
Subject: |
[elpa] master a80033d 115/177: Refactor yas-good-grace error handling |
Date: |
Sat, 28 Mar 2015 15:41:19 +0000 |
branch: master
commit a80033d1426aee501d5b704318180cf96fbc115f
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Refactor yas-good-grace error handling
* yasnippet.el
(yas--handle-error): New function.
(yas--eval-lisp-no-saves, yas--eval-lisp): Use it.
---
yasnippet.el | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/yasnippet.el b/yasnippet.el
index e2dbca0..c1527dd 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1246,6 +1246,12 @@ yasnippet keeps a list of modes like this to help the
judgment."
(or (fboundp mode)
(find mode yas--known-modes)))
+(defun yas--handle-error (err)
+ "Handle error depending on value of `yas-good-grace'."
+ (let ((msg (yas--format "elisp error: %s" (error-message-string err))))
+ (if yas-good-grace msg
+ (error msg))))
+
(defun yas--eval-lisp (form)
"Evaluate FORM and convert the result to string."
(let ((retval (catch 'yas--exception
@@ -1257,10 +1263,7 @@ yasnippet keeps a list of modes like this to help the
judgment."
(let ((result (eval form)))
(when result
(format "%s" result))))))
- (error (if yas-good-grace
- (yas--format "elisp error! %s"
(error-message-string err))
- (error (yas--format "elisp error: %s"
- (error-message-string err)))))))))
+ (error (yas--handle-error err))))))
(when (and (consp retval)
(eq 'yas--exception (car retval)))
(error (cdr retval)))
@@ -1269,10 +1272,7 @@ yasnippet keeps a list of modes like this to help the
judgment."
(defun yas--eval-lisp-no-saves (form)
(condition-case err
(eval form)
- (error (if yas-good-grace
- (yas--format "elisp error! %s" (error-message-string err))
- (error (yas--format "elisp error: %s"
- (error-message-string err)))))))
+ (error (yas--handle-error err))))
(defun yas--read-lisp (string &optional nil-on-error)
"Read STRING as a elisp expression and return it.
- [elpa] master c07db05 102/177: yas-x-prompt: remove dead code, (continued)
- [elpa] master c07db05 102/177: yas-x-prompt: remove dead code, João Távora, 2015/03/28
- [elpa] master 43a501a 103/177: remove yas--x-pretty-prompt-templates, João Távora, 2015/03/28
- [elpa] master 8e7295b 108/177: Closes #403: more uniform behaviour for `yas-use-menu', João Távora, 2015/03/28
- [elpa] master 498cbe4 105/177: Closes #469: Don't use `yas--init-minor-keymap', João Távora, 2015/03/28
- [elpa] master e7599b9 104/177: Merge pull request #466 from npostavs/no-reverse, João Távora, 2015/03/28
- [elpa] master a4e04f9 109/177: update doc for org 8.x, João Távora, 2015/03/28
- [elpa] master a0c2217 110/177: Merge pull request #473 from npostavs/org8, João Távora, 2015/03/28
- [elpa] master b36a4f7 107/177: Properly closes #469: Don't use `yas--init-minor-keymap', João Távora, 2015/03/28
- [elpa] master d809e88 106/177: Revert "Closes #469: Don't use `yas--init-minor-keymap'", João Távora, 2015/03/28
- [elpa] master 599a262 113/177: Closes #474: fix cc-mode fontification conflict, João Távora, 2015/03/28
- [elpa] master a80033d 115/177: Refactor yas-good-grace error handling,
João Távora <=
- [elpa] master 4d9eee9 111/177: Simpler, more effective .travis file, João Távora, 2015/03/28
- [elpa] master 4473b4e 112/177: New test for cc-mode's fontification functions, João Távora, 2015/03/28
- [elpa] master 8ced5c7 117/177: Remove type, expand-env from new snippet value, João Távora, 2015/03/28
- [elpa] master 4ccf133 114/177: Merge pull request #476 from npostavs/cc-fontify2, João Távora, 2015/03/28
- [elpa] master f176027 118/177: Restore backquotes lost in rst -> org translation, João Távora, 2015/03/28
- [elpa] master 580e5c6 116/177: Don't lose error message when yas-good-grace is t, João Távora, 2015/03/28
- [elpa] master 4c16eae 119/177: Document uuid directive, João Távora, 2015/03/28
- [elpa] master fe288a1 121/177: Fix publishing with org 7.9, João Távora, 2015/03/28
- [elpa] master e1ed662 125/177: Allow jit loading interactively, João Távora, 2015/03/28
- [elpa] master e53ec1e 124/177: Make snippets submodule track master, update it, João Távora, 2015/03/28