diff options
| -rw-r--r-- | modules/init-web-mode.el | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/modules/init-web-mode.el b/modules/init-web-mode.el index 5eba924..5fcae5c 100644 --- a/modules/init-web-mode.el +++ b/modules/init-web-mode.el @@ -19,25 +19,28 @@ ;; Django hook ;; require projectile (defun my-django-mode-hook () - (if (projectile-project-p) - (when (file-exists-p (concat (projectile-project-root) "manage.py")) - (web-mode-set-engine "django") + (when (and (require 'web-mode nil t) + (fboundp 'web-mode-set-engine)) + (if (projectile-project-p) + (when (file-exists-p (concat (projectile-project-root) "manage.py")) + (web-mode-set-engine "django") - ;; HTML auto functions - (setq web-mode-enable-auto-opening t) - (setq web-mode-enable-auto-closing t) - (setq web-mode-enable-auto-quoting t) - (setq web-mode-enable-auto-expanding t) + ;; HTML auto functions + (setq web-mode-enable-auto-opening t) + (setq web-mode-enable-auto-closing t) + (setq web-mode-enable-auto-quoting t) + (setq web-mode-enable-auto-expanding t) - ;; Auto-pairing - (require 'smartparens) - (sp-pair "{% " " %}") - (sp-pair "{{ " " }}") - (sp-pair "{# " " #}") - (sp-pair "{" nil :actions :rem) - (sp-pair "<" ">") - - (setq web-mode-enable-auto-pairing nil)))) + ;; Auto-pairing + (require 'smartparens) + (sp-pair "{% " " %}") + (sp-pair "{{ " " }}") + (sp-pair "{# " " #}") + (sp-pair "{" nil :actions :rem) + (sp-pair "<" ">") + (setq web-mode-enable-auto-pairing nil))) + ) + ) ;; Add hooks (add-hook 'web-mode-hook 'my-django-mode-hook)) |