Revert macros to ...! name convention (elisp doesn't like @...)

core/core-popups.el

@@ -38,7 +38,7 @@
   "A list of window parameters that are set (and cleared) when `doom-popup-mode
 is enabled/disabled.'")
 
-(@def-setting :popup (&rest rules)
+(def-setting! :popup (&rest rules)
   "Prepend a new popup rule to `shackle-rules'."
   (if (cl-every 'listp rules)
       `(nconc shackle-rules ',rules)
@@ -49,7 +49,7 @@ is enabled/disabled.'")
 ;; Bootstrap
 ;;
 
-(@def-package shackle :demand t
+(def-package! shackle :demand t
   :init
   (setq shackle-default-alignment 'below
         ;;; Baseline popup-window rules
@@ -146,7 +146,7 @@ for :align t on every rule."
              (set-window-parameter window param nil))))))
 
 ;; Hide modeline in completion popups
-(@add-hook (completion-in-region-mode completion-list-mode) 'doom-hide-modeline-mode)
+(add-hook! (completion-in-region-mode completion-list-mode) 'doom-hide-modeline-mode)
 
 ;;
 (defun doom*popup-init (orig-fn &rest args)
@@ -203,7 +203,7 @@ properties."
 ;; Hacks
 ;;
 
-(@after evil
+(after! evil
   (let ((map doom-popup-mode-map))
     (define-key map [remap evil-window-delete]           'doom/popup-close)
     (define-key map [remap evil-window-move-very-bottom] 'ignore)
@@ -269,7 +269,7 @@ the command buffer."
   (advice-add 'windmove-find-other-window :override 'doom*ignore-window-parameters-in-popups))
 
 
-(@after help-mode
+(after! help-mode
   ;; Help buffers use `other-window' to decide where to open followed links,
   ;; which can be unpredictable. It should *only* replace the original buffer we
   ;; opened the popup from. To fix this these three button
@@ -318,12 +318,12 @@ the command buffer."
                          (message "Unable to find location in file"))))))
 
 
-;; (@after magit
+;; (after! magit
 ;;   ;; Don't open files (from magit) within the magit popup
 ;;   (advice-add 'magit-display-file-buffer-traditional :around 'doom*popups-save))
 
 
-(@after neotree
+(after! neotree
   (defun doom*popups-save-neotree (orig-fn &rest args)
     "Prevents messing up the neotree buffer on window changes."
     (let ((neo-p (and (featurep 'neotree)
@@ -350,7 +350,7 @@ the command buffer."
   (advice-add 'evil-window-move-far-right   :around 'doom*popups-save-neotree))
 
 
-(@add-hook org-load
+(add-hook! org-load
   ;; Ensures org-src-edit yields control of its buffer to shackle.
   (defun doom*org-src-switch-to-buffer (buffer context) (pop-to-buffer buffer))
   (advice-add 'org-src-switch-to-buffer :override 'doom*org-src-switch-to-buffer)
@@ -382,8 +382,8 @@ the command buffer."
         (setq org-agenda-archives-mode nil
               org-agenda-buffer nil))))
 
-  (@after org-agenda
-    (@after evil
+  (after! org-agenda
+    (after! evil
       (evil-define-key* 'motion org-agenda-mode-map
         [escape] 'doom/popup-org-agenda-quit
         (kbd "ESC") 'doom/popup-org-agenda-quit))
@@ -393,8 +393,8 @@ the command buffer."
       (define-key map "Q" 'doom/popup-org-agenda-quit))))
 
 
-(@after repl-toggle
-  (@add-hook doom-popup-close
+(after! repl-toggle
+  (add-hook! doom-popup-close
     (setq rtog/--last-buffer nil)))
 
 (provide 'core-popups)