From db4cd31a1104890b5cb27e6ae230498288b7dd51 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Thu, 28 Apr 2016 20:20:55 -0400 Subject: [PATCH] Delete active region for trigger key expansion This makes yas-expand-from-trigger-key consistent with yas-insert-snippet. * yasnippet.el (yas-expand-from-trigger-key): Expand start end interval with active region. --- yasnippet.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/yasnippet.el b/yasnippet.el index 423f58a..c1a366b 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -2170,9 +2170,13 @@ object satisfying `yas--field-p' to restrict the expansion to." (yas--templates-for-key-at-point)) (yas--templates-for-key-at-point)))) (if templates-and-pos - (yas--expand-or-prompt-for-template (nth 0 templates-and-pos) - (nth 1 templates-and-pos) - (nth 2 templates-and-pos)) + (yas--expand-or-prompt-for-template + (nth 0 templates-and-pos) + ;; Delete snippet key and active region when expanding. + (min (if (use-region-p) (region-beginning) most-positive-fixnum) + (nth 1 templates-and-pos)) + (max (if (use-region-p) (region-end) most-negative-fixnum) + (nth 2 templates-and-pos))) (yas--fallback)))) (defun yas-expand-from-keymap ()