emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1288 from mfiano/common-lisp-local-leader-labels

Browse source 
Fix common-lisp local leader prefix labels
This commit is contained in:
Henrik Lissner 2019-04-02 13:14:32 -04:00 • committed by GitHub
commit 823f47864c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/lang/common-lisp/autoload/hydras.el
View file

@ -1,19 +0,0 @@
;;; lang/common-lisp/autoload/hydras.el -*- lexical-binding: 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)
"
Macro Expansion
^^Definitions ^^Compiler Notes ^^Stickers
^^^^^^─────────────────────────────────────────────────────────────────────────────────────
[_e_] Expand
[_c_] Collapse
[_n_] Next level
[_N_] Previous level
[_q_] Exit
"
("e" macrostep-expand)
("c" macrostep-collapse)
("n" macrostep-next-macro)
("N" macrostep-prev-macro)
("q" macrostep-collapse-all :exit t))

117
modules/lang/common-lisp/config.el
View file

@ -77,64 +77,64 @@ bin/doom while packages at compile-time (not a runtime though)."
(advice-add #'sly-check-version :before #'+common-lisp*refresh-sly-version) (advice-add #'sly-check-version :before #'+common-lisp*refresh-sly-version)
(map! :localleader (map! :localleader
:map sly-mode-map :map lisp-mode-map
"'" #'sly :desc "Sly" "'" #'sly
(:prefix "g" :desc "Sly (ask)" ";" (λ! () (let ((current-prefix-arg '-)) (sly nil nil t)))
"b" #'sly-pop-find-definition-stack (:prefix ("g" . "Go")
"d" #'sly-edit-definition :desc "Go back" "b" #'sly-pop-find-definition-stack
"D" #'sly-edit-definition-other-window :desc "Go to" "d" #'sly-edit-definition
"n" #'sly-next-note :desc "Go to (other window)" "D" #'sly-edit-definition-other-window
"N" #'sly-previous-note :desc "Next note" "n" #'sly-next-note
"s" #'sly-stickers-next-sticker :desc "Previous note" "N" #'sly-previous-note
"S" #'sly-stickers-prev-sticker) :desc "Next sticker" "s" #'sly-stickers-next-sticker
(:prefix "h" :desc "Previous sticker" "S" #'sly-stickers-prev-sticker)
"<" #'sly-who-calls (:prefix ("h" . "Help")
">" #'sly-calls-who :desc "Who calls" "<" #'sly-who-calls
"~" #'hyperspec-lookup-format :desc "Calls who" ">" #'sly-calls-who
"#" #'hyperspec-lookup-reader-macro :desc "Lookup format directive" "~" #'hyperspec-lookup-format
"a" #'sly-apropos :desc "Lookup reader macro" "#" #'hyperspec-lookup-reader-macro
"b" #'sly-who-binds :desc "Apropos" "a" #'sly-apropos
"d" #'sly-disassemble-symbol :desc "Who binds" "b" #'sly-who-binds
"h" #'sly-describe-symbol :desc "Disassemble symbol" "d" #'sly-disassemble-symbol
"H" #'sly-hyperspec-lookup :desc "Describe symbol" "h" #'sly-describe-symbol
"m" #'sly-who-macroexpands :desc "HyperSpec lookup" "H" #'sly-hyperspec-lookup
"p" #'sly-apropos-package :desc "Who macro-expands" "m" #'sly-who-macroexpands
"r" #'sly-who-references :desc "Apropos package" "p" #'sly-apropos-package
"s" #'sly-who-specializes :desc "Who references" "r" #'sly-who-references
"S" #'sly-who-sets) :desc "Who specializes" "s" #'sly-who-specializes
(:prefix "c" :desc "Who sets" "S" #'sly-who-sets)
"c" #'sly-compile-file (:prefix ("c" . "Compile")
"C" #'sly-compile-and-load-file :desc "Compile file" "c" #'sly-compile-file
"f" #'sly-compile-defun :desc "Compile/load file" "C" #'sly-compile-and-load-file
"l" #'sly-load-file :desc "Compile toplevel form" "f" #'sly-compile-defun
"n" #'sly-remove-notes :desc "Load file" "l" #'sly-load-file
"r" #'sly-compile-region) :desc "Remove notes" "n" #'sly-remove-notes
(:prefix "e" :desc "Compile region" "r" #'sly-compile-region)
"b" #'sly-eval-buffer (:prefix ("e" . "Evaluate")
"e" #'sly-eval-last-expression :desc "Evaulate buffer" "b" #'sly-eval-buffer
"E" #'sly-eval-print-last-expression :desc "Evaluate last" "e" #'sly-eval-last-expression
"f" #'sly-eval-defun :desc "Evaluate/print last" "E" #'sly-eval-print-last-expression
"F" #'sly-undefine-function :desc "Evaluate defun" "f" #'sly-eval-defun
"r" #'sly-eval-region) :desc "Undefine function" "F" #'sly-undefine-function
(:prefix "m" :desc "Evaluate region" "r" #'sly-eval-region)
"e" #'+common-lisp/macrostep/body (:prefix ("m" . "Macro")
"E" #'macrostep-expand) :desc "Macrostep" "e" #'macrostep-expand)
(:prefix "r" (:prefix ("r" . "REPL")
"c" #'sly-mrepl-clear-repl :desc "Clear REPL" "c" #'sly-mrepl-clear-repl
"q" #'sly-quit-lisp :desc "Quit connection" "q" #'sly-quit-lisp
"r" #'sly-restart-inferior-lisp :desc "Restart connection" "r" #'sly-restart-inferior-lisp
"s" #'sly-mrepl-sync) :desc "Sync REPL" "s" #'sly-mrepl-sync)
(:prefix "s" (:prefix ("s" . "Stickers")
"b" #'sly-stickers-toggle-break-on-stickers :desc "Toggle breaking stickers" "b" #'sly-stickers-toggle-break-on-stickers
"c" #'sly-stickers-clear-defun-stickers :desc "Clear defun stickers" "c" #'sly-stickers-clear-defun-stickers
"C" #'sly-stickers-clear-buffer-stickers :desc "Clear buffer stickers" "C" #'sly-stickers-clear-buffer-stickers
"f" #'sly-stickers-fetch :desc "Fetch stickers" "f" #'sly-stickers-fetch
"r" #'sly-stickers-replay :desc "Replay stickers" "r" #'sly-stickers-replay
"s" #'sly-stickers-dwim) :desc "Add/remove sticker" "s" #'sly-stickers-dwim)
(:prefix "t" (:prefix ("t" . "Trace")
"t" #'sly-toggle-trace-fdefinition :desc "Toggle" "t" #'sly-toggle-trace-fdefinition
"T" #'sly-toggle-fancy-trace :desc "Toggle (fancy)" "T" #'sly-toggle-fancy-trace
"u" #'sly-untrace-all)) :desc "Untrace all" "u" #'sly-untrace-all))
(when (featurep! :feature evil +everywhere) (when (featurep! :feature evil +everywhere)
(add-hook 'sly-mode-hook #'evil-normalize-keymaps) (add-hook 'sly-mode-hook #'evil-normalize-keymaps)
@ -243,7 +243,6 @@ bin/doom while packages at compile-time (not a runtime though)."
"q" 'quit-window "q" 'quit-window
"r" 'sly-xref-retract))) "r" 'sly-xref-retract)))
(def-package! sly-repl-ansi-color (def-package! sly-repl-ansi-color
:defer t :defer t
:init :init