ansible: fix error void function ansible:auto-decrypt-encrypt

This commit is contained in:
syl20bnr 2018-01-29 13:52:39 -05:00
parent 5f6f9d2333
commit d1b7872ced
2 changed files with 16 additions and 6 deletions

View file

@ -10,18 +10,26 @@
;;; License: GPLv3
(defun spacemacs//ansible-should-enable? ()
"Return non-nil if `ansible' should be enabled for the current file."
(and (stringp buffer-file-name)
(string-match spacemacs--ansible-filename-re buffer-file-name)))
(defun spacemacs/ansible-maybe-enable ()
"Enable `ansible-mode' if required."
(when (spacemacs//ansible-should-enable?)
(ansible 1)))
(defun spacemacs/ansible-auto-decrypt-encrypt-vault ()
"Auto decrypt/encrypt Vault files."
(when (spacemacs//ansible-should-enable?)
(ansible::auto-decrypt-encrypt)))
(defun spacemacs/ansible-company-maybe-enable ()
"Add the ansible company backend only for when ansible mode is active."
(when (spacemacs//ansible-should-enable?)
(add-to-list 'company-backends 'company-ansible)))
(defun spacemacs/ansible-doc-maybe-enable ()
"Enable `ansible-doc-mode` if possible.'"
(when (spacemacs//ansible-should-enable?)
(ansible-doc-mode 1)))

View file

@ -19,6 +19,7 @@
(defun ansible/init-ansible ()
(use-package ansible
:defer t
:commands ansible::auto-decrypt-encrypt
:init
(progn
(add-hook 'yaml-mode-hook 'spacemacs/ansible-maybe-enable)
@ -26,12 +27,13 @@
(if ansible-auto-encrypt-decrypt
;; add this hook to local-vars-hook to allow users to specify
;; a password file in directory local variables
(add-hook 'yaml-mode-local-vars-hook 'ansible::auto-decrypt-encrypt)
(remove-hook 'yaml-mode-local-vars-hook 'ansible::auto-decrypt-encrypt))
(with-eval-after-load 'ansible
(spacemacs/set-leader-keys-for-minor-mode 'ansible
"bd" 'ansible::decrypt-buffer
"be" 'ansible::encrypt-buffer)))))
(add-hook 'yaml-mode-local-vars-hook
'spacemacs/ansible-auto-decrypt-encrypt-vault)
(remove-hook 'yaml-mode-local-vars-hook
'spacemacs/ansible-auto-decrypt-encrypt-vault))
(spacemacs/set-leader-keys-for-minor-mode 'ansible
"bd" 'ansible::decrypt-buffer
"be" 'ansible::encrypt-buffer))))
(defun ansible/init-ansible-doc ()
(use-package ansible-doc