[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 1c97671 157/177: Closes #536: Fix navigation to zero-lengt
From: |
João Távora |
Subject: |
[elpa] master 1c97671 157/177: Closes #536: Fix navigation to zero-length fields at snippet end |
Date: |
Sat, 28 Mar 2015 15:41:37 +0000 |
branch: master
commit 1c97671c6e47463f9ef3d4cf6d5fefc721d9c726
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Closes #536: Fix navigation to zero-length fields at snippet end
* yasnippet.el (yas--field-probably-deleted-p): A deleted field
was probably modified before, so enforce that condition.
---
yasnippet.el | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/yasnippet.el b/yasnippet.el
index 1644a85..cb1d041 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -3032,12 +3032,14 @@ through the field's start point"
;; field must be zero length
;;
(zerop (- (yas--field-start field) (yas--field-end field)))
- ;; skip if:
+ ;; field must have been modified
+ ;;
+ (yas--field-modified-p field)
+ ;; either:
(or
- ;; 1) is a nested field and it's been modified
+ ;; 1) it's a nested field
;;
- (and (yas--field-parent-field field)
- (yas--field-modified-p field))
+ (yas--field-parent-field field)
;; 2) ends just before the snippet end
;;
(and (eq field (car (last (yas--snippet-fields snippet))))
- [elpa] master 6f7c915 146/177: Compatibility with custom-unlispify-remove-prefixes, (continued)
- [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, 2015/03/28
- [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 <=
- [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
- [elpa] master bb6bbad 161/177: Add file doc/.nosearch, João Távora, 2015/03/28
- [elpa] master 9709dbd 164/177: Add autoload cookies, João Távora, 2015/03/28
- [elpa] master b62bdf3 163/177: Closes #546: backport `yas-initialize' and provide `yas/initialize', João Távora, 2015/03/28
- [elpa] master e161fc0 162/177: Merge pull request #542 from tarsius/nosearch, João Távora, 2015/03/28
- [elpa] master 07734a1 165/177: Clarify what happens with yas-new-snippet., João Távora, 2015/03/28
- [elpa] master 3c13348 167/177: yas-expand-snippet: Clarify EXPAND-ENV, João Távora, 2015/03/28