From 72be6f0fc2404b03cb3f7537b5fa8d2b157d5367 Mon Sep 17 00:00:00 2001 From: Zhang Chiyuan Date: Thu, 27 Mar 2008 08:25:37 +0000 Subject: [PATCH] bug fix: infinite recursion when several snippets overlaps. --- doc/changelog.rst | 5 +++++ yasnippet.el | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/changelog.rst b/doc/changelog.rst index f99cf51..caa87fa 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -6,6 +6,11 @@ ChangeLog :Contact: pluskid@gmail.com :Date: 2008-03-22 +0.4.5 +================== + +* Bug fix: l-safe-expr-p: Lisp nesting exceeds ``max-lisp-eval-depth`` error when several (more than two) snippets overlaps. Thanks sunwaybupt@newsmth for reporting this bug. + 0.4.4 / 2008-03-24 ================== diff --git a/yasnippet.el b/yasnippet.el index 5370573..b745a2c 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -1134,10 +1134,12 @@ when the condition evaluated to non-nil." (keymap (overlay-get overlay 'keymap)) (command nil)) (overlay-put overlay 'keymap nil) + (overlay-put overlay 'yas/snippet-reference nil) (setq command (key-binding yas/next-field-key)) (when (commandp command) (call-interactively command)) - (overlay-put overlay 'keymap keymap)))) + (overlay-put overlay 'keymap keymap) + (overlay-put overlay 'yas/snippet-reference snippet)))) (when (= (point) (overlay-start (yas/field-overlay