From 9a06b97e41650dcc2a28d7f2c2dfc7fdd7bb4496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Sun, 2 Nov 2014 23:53:11 +0000 Subject: [PATCH] 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 file changed, 6 insertions(+), 4 deletions(-) diff --git a/yasnippet.el b/yasnippet.el index 1644a857..cb1d0412 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))))