From 0882cd7b2dc3bdd12797ec691bbc9f94c5faced2 Mon Sep 17 00:00:00 2001 From: James Nguyen Date: Wed, 12 Sep 2018 18:48:38 -0700 Subject: [PATCH] Indium: Replace breakpoint functions --- evil-collection-indium.el | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/evil-collection-indium.el b/evil-collection-indium.el index 93729d2..8393eb4 100644 --- a/evil-collection-indium.el +++ b/evil-collection-indium.el @@ -91,11 +91,11 @@ (when evil-collection-settings-setup-debugger-keys (evil-collection-define-key 'normal 'indium-interaction-mode-map - [left-fringe mouse-1] 'evil-collection-indium-debugger-mouse-toggle-breakpoint - [left-margin mouse-1] 'evil-collection-indium-debugger-mouse-toggle-breakpoint + [left-fringe mouse-1] 'indium-mouse-toggle-breakpoint + [left-margin mouse-1] 'indium-mouse-toggle-breakpoint [f5] 'indium-debugger-resume [S-f5] 'indium-debugger-resume - [f9] 'evil-collection-indium-debugger-toggle-breakpoint + [f9] 'indium-toggle-breakpoint [f10] 'indium-debugger-step-over [f11] 'indium-debugger-step-into [S-f11] 'indium-debugger-step-out)) @@ -106,28 +106,5 @@ (kbd "C-j") 'indium-repl-next-input (kbd "C-k") 'indium-repl-previous-input)) -;; FIXME: It would be better for these to go upstream. -(declare-function indium-breakpoint-on-current-line-p "indium-breakpoint") -(declare-function indium-remove-breakpoint "indium-interaction") -(declare-function indium-add-breakpoint "indium-interaction") - -(defun evil-collection-indium-debugger-toggle-breakpoint () - "Toggle breakpoint at point." - (interactive) - (if (indium-breakpoint-on-current-line-p) - (call-interactively #'indium-remove-breakpoint) - (call-interactively #'indium-add-breakpoint))) - -(defun evil-collection-indium-debugger-mouse-toggle-breakpoint (event) - "Toggle breakpoint at mouse EVENT click point." - (interactive "e") - (let* ((posn (event-end event)) - (pos (posn-point posn))) - (when (numberp pos) - (with-current-buffer (window-buffer (posn-window posn)) - (save-excursion - (goto-char pos) - (call-interactively #'evil-collection-indium-debugger-toggle-breakpoint)))))) - (provide 'evil-collection-indium) ;;; evil-collection-indium.el ends here