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

Extra measures to prevent premature yas-minor-mode

Browse Source 
The user's hooks may try to enable yas-minor-mode before yasnippet.el
has finished loading.  In [1], we catch and ignore the errors arising
from this, but it's better if we can avoid hitting the error in the
first place.

This means we have 3 separate measures to avoid the problem, but since
this bug can leave Emacs unusable due to a failing post-command-hook,
a bit of redundant safety is not a bad thing.

* yasnippet.el (yas-minor-mode): Only turn on if yasnippet is fully
loaded.
(yas--font-lock-keywords): Disable user hooks.

[1]: "Avoid potential problems with user's hooks"
4c6064ce1aff07fe4481b5e2d987c8a7f044c207
This commit is contained in:
Noam Postavsky 2016-05-14 07:18:38 -04:00
parent 1b8f5b7a72
commit 0d79e6988e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yasnippet.el
View File

@ -776,7 +776,7 @@ Key bindings:
;; The indicator for the mode line. ;; The indicator for the mode line.
" yas" " yas"
:group 'yasnippet :group 'yasnippet
(cond (yas-minor-mode (cond ((and yas-minor-mode (featurep 'yasnippet))
;; Install the direct keymaps in `emulation-mode-map-alists' ;; Install the direct keymaps in `emulation-mode-map-alists'
;; (we use `add-hook' even though it's not technically a hook, ;; (we use `add-hook' even though it's not technically a hook,
;; but it works). Then define variables named after modes to ;; but it works). Then define variables named after modes to
@ -884,7 +884,9 @@ Honour `yas-dont-activate-functions', which see."
(defvar yas--font-lock-keywords (defvar yas--font-lock-keywords
(append '(("^#.*$" . font-lock-comment-face)) (append '(("^#.*$" . font-lock-comment-face))
(with-temp-buffer (with-temp-buffer
(ignore-errors (emacs-lisp-mode)) (let ((prog-mode-hook nil)
(emacs-lisp-mode-hook nil))
(ignore-errors (emacs-lisp-mode)))
(font-lock-set-defaults) (font-lock-set-defaults)
(if (eq t (car-safe font-lock-keywords)) (if (eq t (car-safe font-lock-keywords))
;; They're "compiled", so extract the source. ;; They're "compiled", so extract the source.