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 bind inhibit-modification-hooks in yas--snippet-create

Browse Source 
* yasnippet.el (yas--snippet-create): Bind before-change-functions and
after-change-functions to nil instead of inhibit-modification-hooks to
t while expanding snippet.  The latter also needlessly blocks overlay
and text property modification hooks (which we don't call ourselves
afterwards).  This way we allow packages like iedit to better
co-operate with yasnippet.
This commit is contained in:
Noam Postavsky 2020-03-30 21:35:42 -04:00
parent 291873ee13
commit 1cc1996074
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
yasnippet.el
View File

@ -4168,21 +4168,26 @@ Returns the newly created snippet."
(yas--letenv expand-env (yas--letenv expand-env
;; Put a single undo action for the expanded snippet's ;; Put a single undo action for the expanded snippet's
;; content. ;; content.
(let ((buffer-undo-list t) (let ((buffer-undo-list t))
(inhibit-modification-hooks t)) (goto-char begin)
;; Call before and after change functions manually,
;; otherwise cc-mode's cache can get messed up. Don't use
;; `inhibit-modification-hooks' for that, that blocks
;; overlay and text property hooks as well! FIXME: Maybe
;; use `combine-change-calls'? (Requires Emacs 27+ though.)
(run-hook-with-args 'before-change-functions begin end)
(let ((before-change-functions nil)
(after-change-functions nil))
;; Some versions of cc-mode fail when inserting snippet ;; Some versions of cc-mode fail when inserting snippet
;; content in a narrowed buffer, so make sure to insert ;; content in a narrowed buffer, so make sure to insert
;; before narrowing. Furthermore, call before and after ;; before narrowing.
;; change functions manually, otherwise cc-mode's cache can
;; get messed up.
(goto-char begin)
(run-hook-with-args 'before-change-functions begin begin)
(insert content) (insert content)
(setq end (+ end (length content))) (narrow-to-region begin (point))
(narrow-to-region begin end)
(goto-char (point-min)) (goto-char (point-min))
(yas--snippet-parse-create snippet) (yas--snippet-parse-create snippet))
(run-hook-with-args 'after-change-functions (point-min) (point-max) 0)) (run-hook-with-args 'after-change-functions
(point-min) (point-max)
(- (point-max) (point-min))))
(when (listp buffer-undo-list) (when (listp buffer-undo-list)
(push (cons (point-min) (point-max)) (push (cons (point-min) (point-max))
buffer-undo-list)) buffer-undo-list))