Fix: the function ‘web-mode-set-engine’ might not be defined at runtime
This commit is contained in:
parent
44af1becb9
commit
012e37a370
@ -19,25 +19,28 @@
|
|||||||
;; Django hook
|
;; Django hook
|
||||||
;; require projectile
|
;; require projectile
|
||||||
(defun my-django-mode-hook ()
|
(defun my-django-mode-hook ()
|
||||||
(if (projectile-project-p)
|
(when (and (require 'web-mode nil t)
|
||||||
(when (file-exists-p (concat (projectile-project-root) "manage.py"))
|
(fboundp 'web-mode-set-engine))
|
||||||
(web-mode-set-engine "django")
|
(if (projectile-project-p)
|
||||||
|
(when (file-exists-p (concat (projectile-project-root) "manage.py"))
|
||||||
|
(web-mode-set-engine "django")
|
||||||
|
|
||||||
;; HTML auto functions
|
;; HTML auto functions
|
||||||
(setq web-mode-enable-auto-opening t)
|
(setq web-mode-enable-auto-opening t)
|
||||||
(setq web-mode-enable-auto-closing t)
|
(setq web-mode-enable-auto-closing t)
|
||||||
(setq web-mode-enable-auto-quoting t)
|
(setq web-mode-enable-auto-quoting t)
|
||||||
(setq web-mode-enable-auto-expanding t)
|
(setq web-mode-enable-auto-expanding t)
|
||||||
|
|
||||||
;; Auto-pairing
|
;; Auto-pairing
|
||||||
(require 'smartparens)
|
(require 'smartparens)
|
||||||
(sp-pair "{% " " %}")
|
(sp-pair "{% " " %}")
|
||||||
(sp-pair "{{ " " }}")
|
(sp-pair "{{ " " }}")
|
||||||
(sp-pair "{# " " #}")
|
(sp-pair "{# " " #}")
|
||||||
(sp-pair "{" nil :actions :rem)
|
(sp-pair "{" nil :actions :rem)
|
||||||
(sp-pair "<" ">")
|
(sp-pair "<" ">")
|
||||||
|
(setq web-mode-enable-auto-pairing nil)))
|
||||||
(setq web-mode-enable-auto-pairing nil))))
|
)
|
||||||
|
)
|
||||||
;; Add hooks
|
;; Add hooks
|
||||||
(add-hook 'web-mode-hook 'my-django-mode-hook))
|
(add-hook 'web-mode-hook 'my-django-mode-hook))
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user