aboutsummaryrefslogtreecommitdiff
path: root/lisp/magit-sequence.el
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2026-01-01 17:39:35 +0100
committerJonas Bernoulli <jonas@bernoul.li>2026-01-01 17:39:35 +0100
commitbf1a7dc26396d27e0836762f96919ac314919f32 (patch)
tree42aaf8512c8e9bb2dc451bd67a25eaa4e94d0906 /lisp/magit-sequence.el
parented67642a25e8aa6fc5c5438fb1ddb6d7c7e94ddf (diff)
Improve indentation of interactive
Emacs 31.1 adds variable `lisp-indent-local-overrides'.
Diffstat (limited to 'lisp/magit-sequence.el')
-rw-r--r--lisp/magit-sequence.el40
1 files changed, 20 insertions, 20 deletions
diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el
index 3702d4b..2a655dd 100644
--- a/lisp/magit-sequence.el
+++ b/lisp/magit-sequence.el
@@ -229,18 +229,18 @@ Remove the COMMITS from BRANCH and stay on the current branch.
If a conflict occurs, then you have to fix that and finish the
process manually."
(interactive
- (magit--cherry-move-read-args "harvest" nil
- (lambda (commits)
- (list (let ((branches (magit-list-containing-branches (car commits))))
- (pcase (length branches)
- (0 nil)
- (1 (car branches))
- (_ (magit-completing-read
- (let ((len (length commits)))
- (if (= len 1)
- "Remove 1 cherry from branch"
- (format "Remove %s cherries from branch" len)))
- branches nil t))))))))
+ (magit--cherry-move-read-args "harvest" nil
+ (lambda (commits)
+ (list (let ((branches (magit-list-containing-branches (car commits))))
+ (pcase (length branches)
+ (0 nil)
+ (1 (car branches))
+ (_ (magit-completing-read
+ (let ((len (length commits)))
+ (if (= len 1)
+ "Remove 1 cherry from branch"
+ (format "Remove %s cherries from branch" len)))
+ branches nil t))))))))
(magit--cherry-move commits branch (magit-get-current-branch) args nil t))
;;;###autoload
@@ -250,14 +250,14 @@ Remove COMMITS from the current branch and stay on that branch.
If a conflict occurs, then you have to fix that and finish the
process manually. `HEAD' is allowed to be detached initially."
(interactive
- (magit--cherry-move-read-args "donate" t
- (lambda (commits)
- (list (magit-read-other-branch
- (let ((len (length commits)))
- (if (= len 1)
- "Move 1 cherry to branch"
- (format "Move %s cherries to branch" len))))))
- 'allow-detached))
+ (magit--cherry-move-read-args "donate" t
+ (lambda (commits)
+ (list (magit-read-other-branch
+ (let ((len (length commits)))
+ (if (= len 1)
+ "Move 1 cherry to branch"
+ (format "Move %s cherries to branch" len))))))
+ 'allow-detached))
(magit--cherry-move commits
(or (magit-get-current-branch)
(magit-rev-parse "HEAD"))