Major optimization refactor, across the board

+ enable lexical-scope everywhere (lexical-binding = t): ~5-10% faster
  startup; ~5-20% general boost
+ reduce consing, function calls & garbage collection by preferring
  cl-loop & dolist over lambda closures (for mapc[ar], add-hook, and
  various cl-lib filter/map/reduce functions) -- where possible
+ prefer functions with dedicated opcodes, like assq (see byte-defop's
  in bytecomp.el for more)
+ prefer pcase & cond (faster) over cl-case
+ general refactor for code readability
+ ensure naming & style conventions are adhered to
+ appease byte-compiler by marking unused variables with underscore
+ defer minor mode activation to after-init, emacs-startup or
  window-setup hooks; a customization opportunity for users + ensures
  custom functionality won't interfere with startup.

modules/lang/web/+css.el

@@ -1,4 +1,4 @@
-;;; lang/web/+css.el
+;;; lang/web/+css.el -*- lexical-binding: t; -*-
 
 ;; css-mode hooks apply to scss and less-css modes
 (add-hook 'css-mode-hook #'rainbow-delimiters-mode)
@@ -53,5 +53,5 @@
 
 (def-package! stylus-mode
   :mode "\\.styl$"
-  :init (add-hook! stylus-mode '(yas-minor-mode-on flycheck-mode)))
+  :init (add-hook! stylus-mode #'(yas-minor-mode-on flycheck-mode)))
 

modules/lang/web/+html.el

@@ -1,14 +1,14 @@
-;;; lang/web/config.el
+;;; lang/web/+html.el -*- lexical-binding: t; -*-
 
 (def-package! web-mode
-  :mode ("\\.p?html?$"
-         "\\.\\(tpl\\|blade\\)\\(\\.php\\)?$"
-         "\\.erb$"
-         "\\.jsp$"
-         "\\.as[cp]x$"
-         "\\.mustache$"
-         "\\.tsx$"
-         "wp-content/themes/.+/.+\\.php$")
+  :mode "\\.p?html?$"
+  :mode "\\.\\(tpl\\|blade\\)\\(\\.php\\)?$"
+  :mode "\\.erb$"
+  :mode "\\.jsp$"
+  :mode "\\.as[cp]x$"
+  :mode "\\.mustache$"
+  :mode "\\.tsx$"
+  :mode "wp-content/themes/.+/.+\\.php$"
   :init
   (add-hook 'web-mode-hook #'turn-off-smartparens-mode)
   :config
@@ -38,7 +38,8 @@
 
 
 (def-package! pug-mode
-  :mode ("\\.jade$" "\\.pug$")
+  :mode "\\.jade$"
+  :mode "\\.pug$"
   :config
   (set! :company-backend 'pug-mode '(company-yasnippet))
   (map! :map pug-mode-map

modules/lang/web/autoload/css.el

@@ -1,4 +1,4 @@
-;;; lang/web/+css.el
+;;; lang/web/autoload/css.el -*- lexical-binding: t; -*-
 
 ;;;###autoload
 ;; TODO (defun +css/scss-build ())
@@ -12,10 +12,9 @@
   (interactive)
   ;; TODO Remove evil dependency
   (save-excursion
-    (let* ((bounds (or (ignore-errors (evil-a-curly))
-                       (user-error "No block found")))
-           (beg (car bounds))
-           (end (cadr bounds)))
+    (destructuring-bind (beg end)
+        (or (ignore-errors (evil-a-curly))
+            (user-error "No block found"))
       (if (= (line-number-at-pos beg) (line-number-at-pos end))
           (save-excursion
             (goto-char (1+ beg)) (insert "\n")

modules/lang/web/autoload/evil.el

@@ -1,4 +1,4 @@
-;;; lang/html/autoload/evil.el
+;;; lang/html/autoload/evil.el -*- lexical-binding: t; -*-
 
 ;;;###autoload (autoload '+web:encode-html-entities "lang/web/autoload/evil" nil t)
 (evil-define-operator +web:encode-html-entities (beg end &optional input)

modules/lang/web/autoload/html.el

@@ -1,4 +1,4 @@
-;;; lang/web/autoload/html.el
+;;; lang/web/autoload/html.el -*- lexical-binding: t; -*-
 
 ;;;###autoload
 (defvar +web-entities-list
@@ -16,14 +16,12 @@ character.")
   "HTML encode/decode TEXT. Based on Xah's replace HTML named entities function
 @ http://ergoemacs.org/emacs/elisp_replace_html_entities_command.html"
   (interactive "<!><r>")
-  (mapc (lambda (rep)
-          (let ((from (elt rep (if decode-p 0 1)))
-                (to   (elt rep (if decode-p 1 0)))
-                (case-fold-search t))
-            (when (string-match-p (regexp-quote from) text)
-              (setq text (s-replace from to text)))))
-        +web-entities-list)
-    text)
+  (dolist (rep +web-entities-list text)
+    (let ((from (elt rep (if decode-p 0 1)))
+          (to   (elt rep (if decode-p 1 0)))
+          (case-fold-search t))
+      (when (string-match-p (regexp-quote from) text)
+        (setq text (s-replace from to text))))))
 
 (defun +web--entities-region (beg end &optional decode-p)
   "HTML encode/decode the selected region. Based on Xah's replace HTML named entities
@@ -31,11 +29,10 @@ function @ http://ergoemacs.org/emacs/elisp_replace_html_entities_command.html"
   (save-restriction
     (narrow-to-region beg end)
     (let (case-fold-search)
-      (mapc (lambda (rep)
-              (goto-char (point-min))
-              (while (search-forward (elt rep (if decode-p 0 1)) nil t)
-                (replace-match (elt rep (if decode-p 1 0)) 'FIXEDCASE 'LITERAL)))
-            reps))))
+      (dolist (rep reps)
+        (goto-char (point-min))
+        (while (search-forward (elt rep (if decode-p 0 1)) nil t)
+          (replace-match (elt rep (if decode-p 1 0)) 'FIXEDCASE 'LITERAL))))))
 
 ;;;###autoload
 (defun +web-encode-entities (text)

modules/lang/web/autoload/web.el

@@ -1,2 +1,2 @@
-;;; lang/web/autoload/web.el
+;;; lang/web/autoload/web.el -*- lexical-binding: t; -*-
 

modules/lang/web/config.el

@@ -1,4 +1,4 @@
-;;; lang/web/config.el
+;;; lang/web/config.el -*- lexical-binding: t; -*-
 
 (load! +html)
 (load! +css)
@@ -39,9 +39,10 @@
   :modes (web-mode js-mode coffee-mode css-mode haml-mode pug-mode)
   :files (and "config.yml" (or "_layouts/" "_posts/"))
   :init
-  (add-hook! '+web-jekyll-mode-hook
+  (defun +web|init-jekyll-mode ()
     (when (eq major-mode 'web-mode)
-      (web-mode-set-engine "django"))))
+      (web-mode-set-engine "django")))
+  (add-hook '+web-jekyll-mode-hook #'+web|init-jekyll-mode))
 
 (def-project-mode! +web-wordpress-mode
   :modes (php-mode web-mode css-mode haml-mode pug-mode)