diff options
| author | Jesús <heckyel@hyperbola.info> | 2019-08-09 12:07:48 -0500 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2019-08-09 12:07:48 -0500 |
| commit | 012e37a3706a43d8d19295eb8da4a2660615a4c9 (patch) | |
| tree | eda4a6210cfd8ef1d9e8075ec2e34c569f140a36 /modules | |
| parent | 44af1becb9b542b0437dce84629f78f88e4a5318 (diff) | |
| download | emacs-personal-012e37a3706a43d8d19295eb8da4a2660615a4c9.tar.lz emacs-personal-012e37a3706a43d8d19295eb8da4a2660615a4c9.tar.xz emacs-personal-012e37a3706a43d8d19295eb8da4a2660615a4c9.zip | |
Fix: the function ‘web-mode-set-engine’ might not be defined at runtime
Diffstat (limited to 'modules')
| -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)) |