mirror of
https://github.com/joaotavora/yasnippet.git
synced 2025-10-13 13:13:03 +00:00
Revert "Disable region wrapping for trigger key expansion"
This reverts commit f8d1af1f50f42ac1689c583c152c3b15e8774ae4. Disabling this for trigger key introduced an inconsistency that is more complicated to implement and document than simply fixing region wrapping for trigger key expanded snippets.
This commit is contained in:
parent
e37ce9e488
commit
5d44a9f15e
@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
- Expanding from emacs-lisp code
|
- Expanding from emacs-lisp code
|
||||||
|
|
||||||
** <<Trigger key>>
|
** Trigger key
|
||||||
|
|
||||||
[[sym:yas-expand][=yas-expand=]] tries to expand a /snippet abbrev/ (also known as
|
[[sym:yas-expand][=yas-expand=]] tries to expand a /snippet abbrev/ (also known as
|
||||||
/snippet key/) before point.
|
/snippet key/) before point.
|
||||||
@ -91,10 +91,6 @@ the region contents into the =$0= placeholder of a snippet expanded by
|
|||||||
[[#yas-insert-snippet][=yas-insert-snippet=]]. Setting it to a character value (e.g. =?0=)
|
[[#yas-insert-snippet][=yas-insert-snippet=]]. Setting it to a character value (e.g. =?0=)
|
||||||
will insert the contents of corresponding register.
|
will insert the contents of corresponding register.
|
||||||
|
|
||||||
Note a setting of t is disabled when expanding via [[trigger key]] since
|
|
||||||
it's too awkward to highlight the relevant text while maneuvering
|
|
||||||
point in front of the trigger key.
|
|
||||||
|
|
||||||
Older (versions 0.9.1 and below) of Yasnippet, supported a setting of
|
Older (versions 0.9.1 and below) of Yasnippet, supported a setting of
|
||||||
=cua= that is equivalent to =?0= but only worked with =cua-mode=
|
=cua= that is equivalent to =?0= but only worked with =cua-mode=
|
||||||
turned on. This setting is still supported for backwards
|
turned on. This setting is still supported for backwards
|
||||||
|
@ -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."
|
object satisfying `yas--field-p' to restrict the expansion to."
|
||||||
(interactive)
|
(interactive)
|
||||||
(setq yas--condition-cache-timestamp (current-time))
|
(setq yas--condition-cache-timestamp (current-time))
|
||||||
(let ((templates-and-pos nil)
|
(let (templates-and-pos)
|
||||||
;; 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)))
|
|
||||||
(unless (and yas-expand-only-for-last-commands
|
(unless (and yas-expand-only-for-last-commands
|
||||||
(not (member last-command yas-expand-only-for-last-commands)))
|
(not (member last-command yas-expand-only-for-last-commands)))
|
||||||
(setq templates-and-pos (if field
|
(setq templates-and-pos (if field
|
||||||
|
Loading…
x
Reference in New Issue
Block a user