Revert "Disable region wrapping for trigger key expansion"

[gnu-emacs-elpa] / yasnippet.el

diff --git a/yasnippet.el b/yasnippet.el
index caef9ca6b6147f8114b2987d2fc248d4cba64ffd..423f58a9eb30b81488a870c671a64aebd0fc3ea8 100644 (file)
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -2160,12 +2160,7 @@ Optional argument FIELD is for non-interactive use and is an
 object satisfying `yas--field-p' to restrict the expansion to."
   (interactive)
   (setq yas--condition-cache-timestamp (current-time))
-  (let ((templates-and-pos nil)
-        ;; Disable region wrapping for trigger key expansion: it's too
-        ;; awkward to have point after the trigger while managing the
-        ;; region contents anyway.
-        (yas-wrap-around-region (if (eq yas-wrap-around-region t) nil
-                                  yas-wrap-around-region)))
+  (let (templates-and-pos)
     (unless (and yas-expand-only-for-last-commands
                  (not (member last-command yas-expand-only-for-last-commands)))
       (setq templates-and-pos (if field