Rethink map! macro; replace :local=>:L, :defer=>:map* (addresses #19)

modules/module-css.el

@@ -9,6 +9,11 @@
 (sp-with-modes '(css-mode scss-mode less-css-mode stylus-mode)
   (sp-local-pair "/*" "*/" :post-handlers '(("[d-3]||\n[i]" "RET") ("| " "SPC"))))
 
+(map! (:map* (css-mode-map scss-mode-map less-css-mode-map)
+        :n "M-R" 'doom/web-refresh-browser)
+      (:map* (css-mode-map scss-mode-map less-css-mode-map)
+        :localleader :nv ";" 'doom/append-semicolon))
+
 (use-package css-mode
   :mode "\\.css$"
   :init
@@ -51,9 +56,6 @@
   (push '("scss" "css") projectile-other-file-alist)
   (setq scss-compile-at-save nil))
 
-(map! :map (css-mode-map sass-mode-map scss-mode-map)
-      :n "M-R" 'doom/web-refresh-browser
-      (:localleader :nv ";" 'doom/append-semicolon))
 
 (provide 'module-css)
 ;;; module-css.el ends here

modules/module-elisp.el

@@ -3,9 +3,6 @@
 (associate! emacs-lisp-mode :match "\\(/Cask\\|\\.\\(el\\|gz\\)\\)$")
 (add-hook! emacs-lisp-mode '(eldoc-mode highlight-numbers-mode))
 
-;; Real go-to-definition for elisp
-(map! :map emacs-lisp-mode-map :m "gd" 'doom/elisp-find-function-at-pt)
-
 (add-hook 'emacs-lisp-mode-hook 'doom/elisp-init)
 (defun doom/elisp-init ()
   (def-company-backend! emacs-lisp-mode (elisp yasnippet))
@@ -25,6 +22,9 @@
         (delq (assq 'emacs-lisp-mode editorconfig-indentation-alist)
               editorconfig-indentation-alist))
 
+  ;; Real go-to-definition for elisp
+  (map! :map emacs-lisp-mode-map :m "gd" 'doom/elisp-find-function-at-pt)
+
   (remove-hook 'emacs-lisp-mode-hook 'doom/elisp-init))
 
 (add-hook 'emacs-lisp-mode-hook 'doom/elisp-hook)

modules/module-org.el

@@ -233,8 +233,7 @@
           "Q" 'doom/org-agenda-quit)))
 
 (defun doom|org-keybinds ()
-  (map! :nodefer
-        (:map org-mode-map
+  (map! (:map org-mode-map
           "RET" nil
           "C-j" nil
           "C-k" nil