[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 6877bc6 151/177: Merge pull request #524 from npostavs/fal
From: |
João Távora |
Subject: |
[elpa] master 6877bc6 151/177: Merge pull request #524 from npostavs/fallback-loop |
Date: |
Sat, 28 Mar 2015 15:41:34 +0000 |
branch: master
commit 6877bc6db37d49a170e7bfb14aefff513891e482
Merge: 08b044e e731451
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Merge pull request #524 from npostavs/fallback-loop
Signal an error on recursive yas--fallback calls
---
yasnippet.el | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/yasnippet.el b/yasnippet.el
index 65d8e7c..75f0ad4 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -2248,8 +2248,13 @@ Common gateway for `yas-expand-from-trigger-key' and
(cond ((eq yas-fallback-behavior 'return-nil)
;; return nil
nil)
+ ((eq yas-fallback-behavior 'yas--fallback)
+ (error (concat "yasnippet fallback loop!\n"
+ "This can happen when you bind `yas-expand' "
+ "outside of the `yas-minor-mode-map'.")))
((eq yas-fallback-behavior 'call-other-command)
- (let* ((beyond-yasnippet (yas--keybinding-beyond-yasnippet)))
+ (let* ((yas-fallback-behavior 'yas--fallback)
+ (beyond-yasnippet (yas--keybinding-beyond-yasnippet)))
(yas--message 4 "Falling back to %s" beyond-yasnippet)
(assert (or (null beyond-yasnippet) (commandp beyond-yasnippet)))
(setq this-original-command beyond-yasnippet)
@@ -2258,12 +2263,13 @@ Common gateway for `yas-expand-from-trigger-key' and
((and (listp yas-fallback-behavior)
(cdr yas-fallback-behavior)
(eq 'apply (car yas-fallback-behavior)))
- (if (cddr yas-fallback-behavior)
- (apply (cadr yas-fallback-behavior)
- (cddr yas-fallback-behavior))
- (when (commandp (cadr yas-fallback-behavior))
- (setq this-command (cadr yas-fallback-behavior))
- (call-interactively (cadr yas-fallback-behavior)))))
+ (let ((yas-fallback-behavior 'yas--fallback))
+ (if (cddr yas-fallback-behavior)
+ (apply (cadr yas-fallback-behavior)
+ (cddr yas-fallback-behavior))
+ (when (commandp (cadr yas-fallback-behavior))
+ (setq this-command (cadr yas-fallback-behavior))
+ (call-interactively (cadr yas-fallback-behavior))))))
(t
;; also return nil if all the other fallbacks have failed
nil)))
- [elpa] master be2f815 140/177: Closes #508: Ensure original point when evaluating conditions, (continued)
- [elpa] master be2f815 140/177: Closes #508: Ensure original point when evaluating conditions, João Távora, 2015/03/28
- [elpa] master 241465c 141/177: move eof footer to the actual eof, João Távora, 2015/03/28
- [elpa] master 70de821 143/177: enforce use of spaces for indentation, João Távora, 2015/03/28
- [elpa] master 41cb5f5 145/177: Update snippets submodule, João Távora, 2015/03/28
- [elpa] master cc64ff6 144/177: Merge pull request #514 from tarsius/master, João Távora, 2015/03/28
- [elpa] master 8e9bf3c 147/177: Merge pull request #518 from rnkn/master, João Távora, 2015/03/28
- [elpa] master 6f7c915 146/177: Compatibility with custom-unlispify-remove-prefixes, João Távora, 2015/03/28
- [elpa] master 783cc33 148/177: Use cl-incf instead of cl, João Távora, 2015/03/28
- [elpa] master 08b044e 149/177: Merge pull request #519 from syohex/use-cl-macro, João Távora, 2015/03/28
- [elpa] master e731451 150/177: Signal an error on recursive yas--fallback calls, João Távora, 2015/03/28
- [elpa] master 6877bc6 151/177: Merge pull request #524 from npostavs/fallback-loop,
João Távora <=
- [elpa] master 37df653 142/177: yasnippet-debug.el: quiet byte-compiler, João Távora, 2015/03/28
- [elpa] master 70151f4 152/177: Closes #525, closes #526: Prevent some keybinding fallback loops, João Távora, 2015/03/28
- [elpa] master 6053db0 153/177: Closes #527: Unbreak case where yas-fallback-behaviour is a list, João Távora, 2015/03/28
- [elpa] master b22961a 155/177: Update README.mdown, João Távora, 2015/03/28
- [elpa] master 596e6b2 158/177: Closes #537: Be lenient to extensions operating on snippet fields, João Távora, 2015/03/28
- [elpa] master 1c97671 157/177: Closes #536: Fix navigation to zero-length fields at snippet end, João Távora, 2015/03/28
- [elpa] master e2b876b 154/177: Tweak README.mdown to simplify bug reporting paragraph, João Távora, 2015/03/28
- [elpa] master 51d4ed1 156/177: Update snippets submodule, João Távora, 2015/03/28
- [elpa] master 175e0a3 159/177: Clean up previous change, João Távora, 2015/03/28
- [elpa] master 50ca8d3 160/177: Update README.mdown, João Távora, 2015/03/28