ld/yasnippet
1
0
Fork 0
mirror of https://github.com/joaotavora/yasnippet.git synced 2025-10-14 05:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't add to disabled undo list

Browse Source 
Previously, we were unconditionally pushing entries onto the undo
list, which effectively enables undo, even in buffers where it's
disabled.
* yasnippet.el (yas--commit-snippet, yas--snippet-revive)
(yas--snippet-create): Check that `buffer-undo-list' is a list before
pushing to it.
This commit is contained in:
Noam Postavsky 2018-04-02 07:17:44 -04:00
parent fa6a71c42d
commit 16686075bb
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
yasnippet.el
View File

@ -3390,9 +3390,8 @@ This renders the snippet as ordinary text."
;; ;;
(yas--markers-to-points snippet) (yas--markers-to-points snippet)
;; Take care of snippet revival ;; Take care of snippet revival on undo.
;; (if (and yas-snippet-revival (listp buffer-undo-list))
(if yas-snippet-revival
(push `(apply yas--snippet-revive ,yas-snippet-beg ,yas-snippet-end ,snippet) (push `(apply yas--snippet-revive ,yas-snippet-beg ,yas-snippet-end ,snippet)
buffer-undo-list) buffer-undo-list)
;; Dismember the snippet... this is useful if we get called ;; Dismember the snippet... this is useful if we get called
@ -3963,8 +3962,9 @@ After revival, push the `yas--take-care-of-redo' in the
(when (yas--maybe-move-to-active-field snippet) (when (yas--maybe-move-to-active-field snippet)
(setf (yas--snippet-control-overlay snippet) (yas--make-control-overlay snippet beg end)) (setf (yas--snippet-control-overlay snippet) (yas--make-control-overlay snippet beg end))
(overlay-put (yas--snippet-control-overlay snippet) 'yas--snippet snippet) (overlay-put (yas--snippet-control-overlay snippet) 'yas--snippet snippet)
(push `(apply yas--take-care-of-redo ,snippet) (when (listp buffer-undo-list)
buffer-undo-list))) (push `(apply yas--take-care-of-redo ,snippet)
buffer-undo-list))))
(defun yas--snippet-create (content expand-env begin end) (defun yas--snippet-create (content expand-env begin end)
"Create a snippet from a template inserted at BEGIN to END. "Create a snippet from a template inserted at BEGIN to END.
@ -3984,16 +3984,18 @@ Returns the newly created snippet."
(narrow-to-region begin end) (narrow-to-region begin end)
(goto-char (point-min)) (goto-char (point-min))
(yas--snippet-parse-create snippet)) (yas--snippet-parse-create snippet))
(push (cons (point-min) (point-max)) (when (listp buffer-undo-list)
buffer-undo-list) (push (cons (point-min) (point-max))
buffer-undo-list))
;; Indent, collecting undo information normally. ;; Indent, collecting undo information normally.
(yas--indent snippet) (yas--indent snippet)
;; Follow up with `yas--take-care-of-redo' on the newly ;; Follow up with `yas--take-care-of-redo' on the newly
;; inserted snippet boundaries. ;; inserted snippet boundaries.
(push `(apply yas--take-care-of-redo ,snippet) (when (listp buffer-undo-list)
buffer-undo-list) (push `(apply yas--take-care-of-redo ,snippet)
buffer-undo-list))
;; Sort and link each field ;; Sort and link each field
(yas--snippet-sort-fields snippet) (yas--snippet-sort-fields snippet)