From c3a94478b461d99c0c99493a20ec5bd902254062 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Mon, 17 Apr 2017 15:51:50 -0400 Subject: [PATCH] Fix condition timestamps in key filter functions * yasnippet.el (yas--maybe-expand-key-filter): (yas--maybe-expand-from-keymap-filter): Let-bind `yas--condition-cache-timestamp' to the current time. --- yasnippet.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/yasnippet.el b/yasnippet.el index b4b4df5..b618f73 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -580,7 +580,9 @@ conditions. "Holds the YASnippet menu.") (defun yas--maybe-expand-key-filter (cmd) - (if (yas--templates-for-key-at-point) cmd)) + (when (let ((yas--condition-cache-timestamp (current-time))) + (yas--templates-for-key-at-point)) + cmd)) (defconst yas-maybe-expand '(menu-item "" yas-expand :filter yas--maybe-expand-key-filter) @@ -2230,7 +2232,8 @@ object satisfying `yas--field-p' to restrict the expansion to." (yas--fallback)))) (defun yas--maybe-expand-from-keymap-filter (cmd) - (let* ((vec (cl-subseq (this-command-keys-vector) + (let* ((yas--condition-cache-timestamp (current-time)) + (vec (cl-subseq (this-command-keys-vector) (if current-prefix-arg (length (this-command-keys)) 0)))