Fix: common-lisp module jump hydra conflict

This hydra conflicts with Doom's popup windows in the case a jump
creates a sly-xref-mode buffer. Use direct local leader bindings instead.
This commit is contained in:
Michael Fiano 2018-12-01 15:25:12 -05:00
parent abc7ca84d8
commit fead537328
2 changed files with 8 additions and 21 deletions

View file

@ -1,24 +1,5 @@
;;; lang/common-lisp/autoload/hydras.el -*- lexical-binding: t; -*-
;;;###autoload (autoload '+common-lisp/navigation/body "lang/common-lisp/autoload/hydras" nil nil)
(defhydra +common-lisp/navigation (:exit nil :hint nil :foreign-keys run)
"
^^Definitions ^^Compiler Notes ^^Stickers
^^^^^^
[_g_] Jump to definition [_n_] Next compiler note [_s_] Next sticker
[_G_] Jump to definition (other window) [_N_] Previous compiler note [_S_] Previous sticker
[_b_] Pop from definition
[_q_] Exit
"
("g" sly-edit-definition)
("G" sly-edit-definition-other-window)
("b" sly-pop-find-definition-stack)
("n" sly-next-note)
("N" sly-previous-note)
("s" sly-stickers-next-sticker)
("S" sly-stickers-prev-sticker)
("q" nil :exit t))
;;;###autoload (autoload '+common-lisp/macrostep/body "lang/common-lisp/autoload/hydras" nil nil)
(defhydra +common-lisp/macrostep (:exit nil :hint nil :foreign-keys run)
"

View file

@ -30,7 +30,6 @@
(sp-local-pair "'" "'" :actions nil)
(sp-local-pair "`" "`" :actions nil))
;;
(defun +common-lisp|cleanup-sly-maybe ()
"Kill processes and leftover buffers when killing the last sly buffer."
(unless (cl-loop for buf in (delq (current-buffer) (buffer-list))
@ -70,7 +69,14 @@ bin/doom while packages at compile-time (not a runtime though)."
(map! :map sly-mode-map
:localleader
:n "'" #'sly
:n "g" #'+common-lisp/navigation/body
(:prefix "g"
:n "d" #'sly-edit-definition
:n "D" #'sly-edit-definition-other-window
:n "b" #'sly-pop-find-definition-stack
:n "n" #'sly-next-note
:n "N" #'sly-previous-note
:n "s" #'sly-stickers-next-sticker
:n "S" #'sly-stickers-prev-sticker)
(:prefix "h"
:n "a" #'sly-apropos
:n "b" #'sly-who-binds