[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 580e5c6 116/177: Don't lose error message when yas-good-gr
From: |
João Távora |
Subject: |
[elpa] master 580e5c6 116/177: Don't lose error message when yas-good-grace is t |
Date: |
Sat, 28 Mar 2015 15:41:19 +0000 |
branch: master
commit 580e5c64f62153f0a3c6093770d4ffabcf695ce5
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Don't lose error message when yas-good-grace is t
* yasnippet.el
(yas--eval-lisp-no-saves): Pass error message to message function.
(yas--handle-error): Pass "%s" to error to avoid accidentally
interpreting % in the error message as format codes.
---
yasnippet.el | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/yasnippet.el b/yasnippet.el
index c1527dd..9d4764d 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1250,7 +1250,7 @@ yasnippet keeps a list of modes like this to help the
judgment."
"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))))
+ (error "%s" msg))))
(defun yas--eval-lisp (form)
"Evaluate FORM and convert the result to string."
@@ -1272,7 +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 (yas--handle-error err))))
+ (error (message "%s" (yas--handle-error err)))))
(defun yas--read-lisp (string &optional nil-on-error)
"Read STRING as a elisp expression and return it.
- [elpa] master a0c2217 110/177: Merge pull request #473 from npostavs/org8, (continued)
- [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, 2015/03/28
- [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 <=
- [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
- [elpa] master f98c527 123/177: Replace text -> yas-text in documentation, João Távora, 2015/03/28
- [elpa] master 763f5fa 122/177: Closes #474: fix more cc-mode font-lock conflicts, João Távora, 2015/03/28
- [elpa] master 2b24aea 126/177: Merge pull request #493 from npostavs/ijit, João Távora, 2015/03/28
- [elpa] master 280ece2 131/177: Add yas-shortest-key-until-whitespace, João Távora, 2015/03/28
- [elpa] master 0b7b34a 127/177: Closes #492, closes #494: Consider defalias when calculating parent modes, João Távora, 2015/03/28
- [elpa] master 7761dee 128/177: Closes #497: Allow functions as elements in yas-key-syntaxes, João Távora, 2015/03/28