From 0b48575c1462f1c9bfa871005dd6de7760457792 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 24 May 2018 22:03:17 +0200 Subject: [PATCH] Remove def-hydra! macro alias Causes byte-compilation issues and the alias is unnecessary. --- core/core-keybinds.el | 10 +++------- core/core-ui.el | 1 + modules/completion/ivy/config.el | 2 +- modules/feature/version-control/+git.el | 2 +- modules/feature/version-control/config.el | 10 +++++----- modules/tools/ein/config.el | 2 +- modules/tools/rgb/config.el | 2 +- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/core/core-keybinds.el b/core/core-keybinds.el index 0a3495720..3d9e1ed57 100644 --- a/core/core-keybinds.el +++ b/core/core-keybinds.el @@ -60,15 +60,11 @@ If any hook returns non-nil, all hooks after it are ignored.") (def-package! hydra - :commands (defhydra defhydradio) - :init - ;; In case I later need to wrap defhydra in any special functionality. - (defalias 'def-hydra! 'defhydra) - (defalias 'def-hydra-radio! 'defhydradio) + :defer t :config (setq lv-use-seperator t) - (def-hydra! doom@text-zoom (:hint t :color red) + (defhydra doom@text-zoom (:hint t :color red) " Text zoom: _j_:zoom in, _k_:zoom out, _0_:reset " @@ -76,7 +72,7 @@ If any hook returns non-nil, all hooks after it are ignored.") ("k" text-scale-decrease "out") ("0" (text-scale-set 0) "reset")) - (def-hydra! doom@window-nav (:hint nil) + (defhydra doom@window-nav (:hint nil) " Split: _v_ert _s_:horz Delete: _c_lose _o_nly diff --git a/core/core-ui.el b/core/core-ui.el index 8231627cd..438dc515b 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -24,6 +24,7 @@ Expects a `font-spec'.") return a string). This changes the 'long' name of a major-mode, allowing for shorter major mode name in the mode-line. See `doom|set-mode-name'.") +;; (defvar doom-init-ui-hook nil "List of hooks to run when the UI has been initialized.") diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index 60a201d32..51434fb26 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -141,7 +141,7 @@ immediately runs it on the current candidate (ending the ivy session)." "C-o" #'+ivy@coo/body "M-o" #'ivy-dispatching-done-hydra) :config - (def-hydra! +ivy@coo (:hint nil :color pink) + (defhydra +ivy@coo (:hint nil :color pink) " Move ^^^^^^^^^^ | Call ^^^^ | Cancel^^ | Options^^ | Action _w_/_s_/_a_: %s(ivy-action-name) ----------^^^^^^^^^^-+--------------^^^^-+-------^^-+--------^^-+--------------------------------- diff --git a/modules/feature/version-control/+git.el b/modules/feature/version-control/+git.el index cbb110f5f..88d610089 100644 --- a/modules/feature/version-control/+git.el +++ b/modules/feature/version-control/+git.el @@ -33,7 +33,7 @@ (ignore (git-gutter)))) (add-hook 'doom-escape-hook #'+version-control|update-git-gutter t)) - (def-hydra! +version-control@git-gutter + (defhydra +version-control@git-gutter (:body-pre (git-gutter-mode 1) :hint nil) " ╭─────────────────┐ diff --git a/modules/feature/version-control/config.el b/modules/feature/version-control/config.el index 4a2a9791d..d49a806b1 100644 --- a/modules/feature/version-control/config.el +++ b/modules/feature/version-control/config.el @@ -28,11 +28,11 @@ (defalias #'smerge-diff-upper-lower #'smerge-diff-mine-other) (defalias #'smerge-diff-base-lower #'smerge-diff-base-other))) - (def-hydra! +hydra-smerge (:hint nil - :pre (smerge-mode 1) - ;; Disable `smerge-mode' when quitting hydra if - ;; no merge conflicts remain. - :post (smerge-auto-leave)) + (defhydra +hydra-smerge (:hint nil + :pre (smerge-mode 1) + ;; Disable `smerge-mode' when quitting hydra if + ;; no merge conflicts remain. + :post (smerge-auto-leave)) " ╭────────┐ Movement Keep Diff Other │ smerge │ diff --git a/modules/tools/ein/config.el b/modules/tools/ein/config.el index 5633bf690..812e815a5 100644 --- a/modules/tools/ein/config.el +++ b/modules/tools/ein/config.el @@ -45,7 +45,7 @@ ;; Avy is required for showing links in the notebook list with ace-link. (require 'avy) ;; add hydra - (def-hydra! +ein/hydra (:hint t :color red) + (defhydra +ein/hydra (:hint t :color red) " Operations on Cells^^^^^^ Other ----------------------------^^^^^^ ----------------------------------^^^^ diff --git a/modules/tools/rgb/config.el b/modules/tools/rgb/config.el index b69768ce7..ffab008eb 100644 --- a/modules/tools/rgb/config.el +++ b/modules/tools/rgb/config.el @@ -10,7 +10,7 @@ (def-package! kurecolor :after rainbow-mode :config - (def-hydra! +rgb@kurecolor (:color pink :hint nil) + (defhydra +rgb@kurecolor (:color pink :hint nil) " Inc/Dec _w_/_W_ brightness _d_/_D_ saturation _e_/_E_ hue " ("w" kurecolor-decrease-brightness-by-step)