From cdb19c365438fa4654277764410b26fd0e20107d Mon Sep 17 00:00:00 2001 From: daanturo Date: Mon, 15 Mar 2021 16:44:33 +0700 Subject: [PATCH 1/2] Fix space in edebug-eval-expression. When typing in `edebug-eval-expression` with `lispy-mode` on (`lispy-mode` was enabled for eval-expression), "SPC" key is always forwarded to `edebug-step-mode`, making it hard to type " " without `quote-insert` ("C-q"). --- lispy.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lispy.el b/lispy.el index 70134b7f..9efc5bb2 100644 --- a/lispy.el +++ b/lispy.el @@ -1902,7 +1902,8 @@ If jammed between parens, \"(|(\" unjam: \"(| (\". If after an opening delimiter and before a space (after wrapping a sexp, for example), do the opposite and delete the extra space, \"(| foo)\" to \"(|foo)\"." (interactive "p") - (cond ((bound-and-true-p edebug-active) + (cond ((and (bound-and-true-p edebug-active) + (lispy--edebug-commandp)) (edebug-step-mode)) ((region-active-p) (goto-char (region-end)) From fd5a9b3991637840520410514cb19f7451373b2b Mon Sep 17 00:00:00 2001 From: daanturo Date: Mon, 15 Mar 2021 19:19:42 +0700 Subject: [PATCH 2/2] Simplify lispy-space's edebug commandp check. --- lispy.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lispy.el b/lispy.el index 9efc5bb2..b4cabebc 100644 --- a/lispy.el +++ b/lispy.el @@ -1902,8 +1902,7 @@ If jammed between parens, \"(|(\" unjam: \"(| (\". If after an opening delimiter and before a space (after wrapping a sexp, for example), do the opposite and delete the extra space, \"(| foo)\" to \"(|foo)\"." (interactive "p") - (cond ((and (bound-and-true-p edebug-active) - (lispy--edebug-commandp)) + (cond ((lispy--edebug-commandp) (edebug-step-mode)) ((region-active-p) (goto-char (region-end))