[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/embark 7dbb9eb302: Adjust repeatable smerge commands
From: |
ELPA Syncer |
Subject: |
[elpa] externals/embark 7dbb9eb302: Adjust repeatable smerge commands |
Date: |
Thu, 18 May 2023 00:58:10 -0400 (EDT) |
branch: externals/embark
commit 7dbb9eb3025bec18ce7384b5e2f5ef9407d9f253
Author: Omar Antolín <omar.antolin@gmail.com>
Commit: Omar Antolín <omar.antolin@gmail.com>
Adjust repeatable smerge commands
Only commands that leave point on a smerge conflict should be repeatable.
---
embark.el | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/embark.el b/embark.el
index 1c69f8cfac..4ace63a7d4 100644
--- a/embark.el
+++ b/embark.el
@@ -529,9 +529,7 @@ argument: a one element list containing the target."
backward-sexp forward-sentence backward-sentence
forward-paragraph backward-paragraph
;; smerge commands
- smerge-refine smerge-combine-with-next smerge-keep-current
- smerge-keep-upper smerge-keep-lower smerge-keep-base
- smerge-keep-all smerge-resolve smerge-prev smerge-next)
+ smerge-refine smerge-combine-with-next smerge-prev smerge-next)
"List of repeatable actions.
When you use a command on this list as an Embark action from
outside the minibuffer, `embark-act' does not exit but instead
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/embark 7dbb9eb302: Adjust repeatable smerge commands,
ELPA Syncer <=