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

yasnippet.el: Work around Emacs bug#65929 (see also issue#1175)

Browse Source 
(yas--on-protection-overlay-modification): Ignore clearly bogus calls.
(yas-keymap-disable-hook): Improve docstring.
This commit is contained in:
Stefan Monnier 2024-01-17 13:24:15 -05:00
parent 23c7a6fa51
commit 9f253badfb
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yasnippet-tests.el
View File

@ -1,6 +1,6 @@
;;; yasnippet-tests.el --- some yasnippet tests -*- lexical-binding: t -*- ;;; yasnippet-tests.el --- some yasnippet tests -*- lexical-binding: t -*-
;; Copyright (C) 2012-2023 Free Software Foundation, Inc. ;; Copyright (C) 2012-2024 Free Software Foundation, Inc.
;; Author: João Távora <joaot@siscog.pt> ;; Author: João Távora <joaot@siscog.pt>
;; Keywords: emulations, convenience ;; Keywords: emulations, convenience

10
yasnippet.el
View File

@ -554,9 +554,12 @@ conditions.
sexp)) sexp))
(defcustom yas-keymap-disable-hook nil (defcustom yas-keymap-disable-hook nil
"The `yas-keymap' bindings are disabled if any function in this list returns non-nil. "Abnormal hook run to decide when `yas-keymap' bindings are enabled.
The bindings are disabled whenever any function in this list returns non-nil.
This is useful to control whether snippet navigation bindings This is useful to control whether snippet navigation bindings
override bindings from other packages (e.g., `company-mode')." override bindings from other packages (e.g., `company-mode').
This is run (several times) every time we perform a key lookup, so
it has to be fast."
:type 'hook) :type 'hook)
(defcustom yas-overlay-priority 100 (defcustom yas-overlay-priority 100
@ -3938,12 +3941,13 @@ Move the overlays, or create them if they do not exit."
;; (overlay-put ov 'evaporate t) ;; (overlay-put ov 'evaporate t)
(overlay-put ov 'modification-hooks '(yas--on-protection-overlay-modification))))))) (overlay-put ov 'modification-hooks '(yas--on-protection-overlay-modification)))))))
(defun yas--on-protection-overlay-modification (_overlay after? beg end &optional length) (defun yas--on-protection-overlay-modification (overlay after? beg end &optional length)
"Commit the snippet if the protection overlay is being killed." "Commit the snippet if the protection overlay is being killed."
(unless (or yas--inhibit-overlay-hooks (unless (or yas--inhibit-overlay-hooks
yas-inhibit-overlay-modification-protection yas-inhibit-overlay-modification-protection
(not after?) (not after?)
(= length (- end beg)) ; deletion or insertion (= length (- end beg)) ; deletion or insertion
(>= beg (overlay-start overlay)) ;Emacs=29.1 bug#65929
(yas--undo-in-progress)) (yas--undo-in-progress))
(let ((snippets (yas-active-snippets))) (let ((snippets (yas-active-snippets)))
(yas--message 2 "Committing snippets. Action would destroy a protection overlay.") (yas--message 2 "Committing snippets. Action would destroy a protection overlay.")