emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Guard skewer-*-mode checks in bound-and-true-p #3252

Browse source 
Make extra sure skewer-*-mode vars are defined before trying to read
them.
This commit is contained in:
Henrik Lissner 2020-05-31 22:34:42 -04:00
parent 36741fae19
commit 002969ee06
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/lang/javascript/autoload.el
View file

@ -42,7 +42,9 @@ skewer-*-mode's are enabled, or `nodejs-repl' otherwise."
(interactive) (interactive)
(call-interactively (call-interactively
(if (and (featurep 'skewer-mode) (if (and (featurep 'skewer-mode)
(or skewer-mode skewer-css-mode skewer-html-mode)) (or (bound-and-true-p skewer-mode)
(bound-and-true-p skewer-css-mode)
(bound-and-true-p skewer-html-mode)))
#'skewer-repl #'skewer-repl
#'nodejs-repl)) #'nodejs-repl))
(current-buffer)) (current-buffer))
@ -62,13 +64,13 @@ Run this for any buffer you want to skewer."
(run-skewer)) (run-skewer))
(pcase major-mode (pcase major-mode
((or 'css-mode 'scss-mode 'less-css-mode) ((or 'css-mode 'scss-mode 'less-css-mode)
(unless skewer-css-mode (unless (bound-and-true-p skewer-css-mode)
(skewer-css-mode +1))) (skewer-css-mode +1)))
((or 'web-mode 'html-mode) ((or 'web-mode 'html-mode)
(unless skewer-html-mode (unless (bound-and-true-p skewer-html-mode)
(skewer-html-mode +1))) (skewer-html-mode +1)))
('js2-mode ('js2-mode
(unless skewer-mode (unless (bound-and-true-p skewer-mode)
(skewer-mode +1))) (skewer-mode +1)))
(_ (error "Invalid mode %s" major-mode)))) (_ (error "Invalid mode %s" major-mode))))
@ -80,9 +82,12 @@ Run this for any buffer you want to skewer."
(httpd-stop)) (httpd-stop))
(dolist (buf (buffer-list)) (dolist (buf (buffer-list))
(with-current-buffer buf (with-current-buffer buf
(if skewer-mode (skewer-mode -1)) (if (bound-and-true-p skewer-mode)
(if skewer-css-mode (skewer-css-mode -1)) (skewer-mode -1))
(if skewer-html-mode (skewer-html-mode -1))))) (if (bound-and-true-p skewer-css-mode)
(skewer-css-mode -1))
(if (bound-and-true-p skewer-html-mode)
(skewer-html-mode -1)))))
;; ;;