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

Fix: expose and honour yas-dont-activate

Browse Source
This commit is contained in:
João Távora 2012-11-06 15:18:04 +00:00
parent 73a1b485d6
commit 81dbf038a1
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
yasnippet.el
View File

@ -738,8 +738,8 @@ Key bindings:
(remove-hook 'post-command-hook 'yas--post-command-handler t) (remove-hook 'post-command-hook 'yas--post-command-handler t)
(remove-hook 'emulation-mode-map-alists 'yas--direct-keymaps)))) (remove-hook 'emulation-mode-map-alists 'yas--direct-keymaps))))
(defvar yas--dont-activate '(minibufferp) (defvar yas-dont-activate '(minibufferp)
"If non-nil don't let `yas-minor-mode-on' active yas for this buffer. "If non-nil don't let `yas-minor-mode-on' activate for this buffer.
If a function, then its result is used. If a function, then its result is used.
@ -749,21 +749,19 @@ activate yas for this buffer.
`yas-minor-mode-on' is usually called by `yas-global-mode' so `yas-minor-mode-on' is usually called by `yas-global-mode' so
this effectively lets you define exceptions to the \"global\" this effectively lets you define exceptions to the \"global\"
behaviour. Can also be a function of zero arguments.") behaviour. Can also be a function of zero arguments.")
(make-variable-buffer-local 'yas--dont-activate) (make-variable-buffer-local 'yas-dont-activate)
(defun yas-minor-mode-on () (defun yas-minor-mode-on ()
"Turn on YASnippet minor mode. "Turn on YASnippet minor mode.
Do this unless `yas--dont-activate' is truish." Honour `yas-dont-activate', which see."
(interactive) (interactive)
(unless (cond ((functionp yas--dont-activate) ;; Check `yas-dont-activate'
(funcall yas--dont-activate)) (unless (cond ((functionp yas-dont-activate)
((consp yas--dont-activate) (funcall yas-dont-activate))
(some #'funcall yas--dont-activate)) ((consp yas-dont-activate)
(yas--dont-activate)) (some #'funcall yas-dont-activate))
;; Load all snippets definitions unless we still don't have a (yas-dont-activate))
;; root-directory or some snippets have already been loaded.
;;
(yas-minor-mode 1))) (yas-minor-mode 1)))
;;;###autoload ;;;###autoload
@ -4403,6 +4401,7 @@ handle the end-of-buffer error fired in it by calling
yas-after-exit-snippet-hook yas-after-exit-snippet-hook
yas-before-expand-snippet-hook yas-before-expand-snippet-hook
yas-buffer-local-condition yas-buffer-local-condition
yas-dont-activate
;; prompting functions ;; prompting functions
;; ;;