From 80ea315cca45c7847e9d58c5545c7d6b55ac6d44 Mon Sep 17 00:00:00 2001 From: Michael Fiano Date: Thu, 28 Mar 2019 16:39:15 -0400 Subject: [PATCH 1/3] Changed some wrong common-lisp bindings The Sly documentation which these were originally based off of is out of date, causing some of the bindings to have no longer defined functions. --- modules/lang/common-lisp/config.el | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/modules/lang/common-lisp/config.el b/modules/lang/common-lisp/config.el index 29348b8e1..1426966a2 100644 --- a/modules/lang/common-lisp/config.el +++ b/modules/lang/common-lisp/config.el @@ -199,35 +199,28 @@ bin/doom while packages at compile-time (not a runtime though)." "S" 'sly-db-show-frame-source "t" 'sly-db-toggle-details) (evil-define-key 'normal sly-inspector-mode-map - [backtab] 'sly-inspector-previous-inspectable-object - [mouse-1] 'sly-inspector-operate-on-click - [mouse-2] 'sly-inspector-operate-on-click - [mouse-6] 'sly-inspector-pop - [mouse-7] 'sly-inspector-next - [return] 'sly-inspector-operate-on-point - [(shift tab)] 'sly-inspector-previous-inspectable-object + [backtab] 'backward-button + [return] 'push-button + [(shift tab)] 'backward-button (kbd "") 'sly-mrepl-copy-part-to-repl - (kbd "C-i") 'sly-inspector-next-inspectable-object - (kbd "C-k") 'sly-inspector-pop - (kbd "C-m") 'sly-inspector-operate-on-point - "." 'sly-inspector-show-source - "D" 'sly-inspector-describe-inspectee + (kbd "C-i") 'next-button + (kbd "C-m") 'push-button "e" 'sly-inspector-eval "gb" 'sly-inspector-pop "gj" 'sly-inspector-next "gr" 'sly-inspector-reinspect "gR" 'sly-inspector-fetch-all "gv" 'sly-inspector-toggle-verbose - "j" 'sly-inspector-next "h" 'sly-inspector-history - "k" 'sly-inspector-previous-inspectable-object - "K" 'sly-inspector-describe - "p" 'sly-inspector-pprint + "k" 'backward-button + "K" 'sly-inspector-describe-inspectee + "p" 'sly-button-pretty-print "q" 'sly-inspector-quit) (evil-define-key 'normal sly-mode-map (kbd "C-t") 'sly-pop-find-definition-stack) (evil-define-key 'normal sly-popup-buffer-mode-map - (kbd "C-t") 'sly-pop-find-definition-stack) + (kbd "C-t") 'sly-pop-find-definition-stack + "q" 'quit-window) (evil-define-key 'normal sly-xref-mode-map [return] 'sly-goto-xref (kbd "S-") 'sly-show-xref From 275bea568e307e6f9f75e0f26e0821b1f01d1c7b Mon Sep 17 00:00:00 2001 From: Michael Fiano Date: Thu, 28 Mar 2019 21:40:06 -0400 Subject: [PATCH 2/3] Added more bindings --- modules/lang/common-lisp/config.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/lang/common-lisp/config.el b/modules/lang/common-lisp/config.el index 1426966a2..44b31b7ba 100644 --- a/modules/lang/common-lisp/config.el +++ b/modules/lang/common-lisp/config.el @@ -148,7 +148,10 @@ bin/doom while packages at compile-time (not a runtime though)." '(sly-db-mode sly-inspector-mode sly-popup-buffer-mode sly-xref-mode) 'normal) (evil-define-key 'insert sly-mrepl-mode-map - [S-return] #'newline-and-indent) + [S-return] #'newline-and-indent + [backspace] #'sp-backward-delete-char + [up] (λ! () (evil-goto-line) (comint-previous-input 1)) + [down] (λ! () (evil-goto-line) (comint-next-input 1))) (evil-define-key 'normal sly-parent-map (kbd "C-t") #'sly-pop-find-definition-stack) (evil-define-key 'normal sly-db-mode-map From 0b2f18542c83a26ceb6b024319114b9641593673 Mon Sep 17 00:00:00 2001 From: Michael Fiano Date: Thu, 28 Mar 2019 22:31:06 -0400 Subject: [PATCH 3/3] Fixed bug where sly-db-quit was not being called --- modules/lang/common-lisp/config.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/lang/common-lisp/config.el b/modules/lang/common-lisp/config.el index 44b31b7ba..8b0663047 100644 --- a/modules/lang/common-lisp/config.el +++ b/modules/lang/common-lisp/config.el @@ -154,9 +154,13 @@ bin/doom while packages at compile-time (not a runtime though)." [down] (λ! () (evil-goto-line) (comint-next-input 1))) (evil-define-key 'normal sly-parent-map (kbd "C-t") #'sly-pop-find-definition-stack) + (evil-define-key 'normal sly-popup-buffer-mode-map + (kbd "C-t") 'sly-pop-find-definition-stack + "q" 'quit-window) (evil-define-key 'normal sly-db-mode-map [follow-link] 'mouse-face [mouse-2] 'sly-db-default-action/mouse + [remap quit-window] 'sly-db-quit (kbd "C-i") 'sly-db-cycle (kbd "C-j") 'sly-db-down (kbd "C-k") 'sly-db-up @@ -221,9 +225,6 @@ bin/doom while packages at compile-time (not a runtime though)." "q" 'sly-inspector-quit) (evil-define-key 'normal sly-mode-map (kbd "C-t") 'sly-pop-find-definition-stack) - (evil-define-key 'normal sly-popup-buffer-mode-map - (kbd "C-t") 'sly-pop-find-definition-stack - "q" 'quit-window) (evil-define-key 'normal sly-xref-mode-map [return] 'sly-goto-xref (kbd "S-") 'sly-show-xref