ld/yasnippet
1
0
Fork 0
mirror of https://github.com/joaotavora/yasnippet.git synced 2025-10-13 21:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

* subtle fom bug found and fixed!

Browse Source
This commit is contained in:
capitaomorte 2010-03-14 16:23:05 +00:00
parent efa4d6e481
commit a090443417
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
yasnippet.el
View File

@ -3365,13 +3365,20 @@ If it does, also:
* call `yas/advance-start-maybe' on FOM's next fom. * call `yas/advance-start-maybe' on FOM's next fom.
* in case FOM is field call `yas/advance-end-maybe' on its parent * in case FOM is field call `yas/advance-end-maybe' on its parent
field" field
(when (and fom (< (yas/fom-end fom) newend))
(set-marker (yas/fom-end fom) newend) Also, if FOM is an exit-marker, always call
(yas/advance-start-maybe (yas/fom-next fom) newend) `yas/advance-start-maybe' on its next fom.
(let ((parent (yas/fom-parent-field fom)))
(when parent "
(yas/advance-end-maybe parent newend))))) (cond ((and fom (< (yas/fom-end fom) newend))
(set-marker (yas/fom-end fom) newend)
(yas/advance-start-maybe (yas/fom-next fom) newend)
(let ((parent (yas/fom-parent-field fom)))
(when parent
(yas/advance-end-maybe parent newend))))
((yas/exit-p fom)
(yas/advance-start-maybe (yas/fom-next fom) newend))))
(defun yas/advance-start-maybe (fom newstart) (defun yas/advance-start-maybe (fom newstart)
"Maybe advance FOM's start to NEWSTART if it needs it. "Maybe advance FOM's start to NEWSTART if it needs it.