[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit c9a738f7d3 04/10: magit-commit-diff-1: New func
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/git-commit c9a738f7d3 04/10: magit-commit-diff-1: New function |
Date: |
Tue, 7 Jun 2022 10:58:26 -0400 (EDT) |
branch: elpa/git-commit
commit c9a738f7d31730d8227e25487492a82ae6cd3979
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
magit-commit-diff-1: New function
---
lisp/magit-commit.el | 52 ++++++++++++++++++++++++++++------------------------
1 file changed, 28 insertions(+), 24 deletions(-)
diff --git a/lisp/magit-commit.el b/lisp/magit-commit.el
index cf647d5e9b..e6ecf26099 100644
--- a/lisp/magit-commit.el
+++ b/lisp/magit-commit.el
@@ -552,30 +552,34 @@ See `magit-commit-absorb' for an alternative
implementation."
;; buffer. Without this that buffer would immediately be
;; replaced with the diff buffer. See #2632.
(unrecord-window-buffer nil diff-buffer))
- (condition-case nil
- (let ((args (car (magit-diff-arguments)))
- (magit-inhibit-save-previous-winconf 'unset)
- (magit-display-buffer-noselect t)
- (inhibit-quit nil)
- (display-buffer-overriding-action
- display-buffer-overriding-action))
- (when magit-commit-diff-inhibit-same-window
- (setq display-buffer-overriding-action
- '(nil (inhibit-same-window t))))
- (message "Diffing changes to be committed (C-g to abort diffing)")
- (cl-case last-command
- (magit-commit-create
- (magit-diff-staged nil args))
- (magit-commit--all
- (magit-diff-working-tree nil args))
- ((magit-commit-amend
- magit-commit-reword
- magit-rebase-reword-commit)
- (magit-diff-while-amending args))
- (t (if (magit-anything-staged-p)
- (magit-diff-staged nil args)
- (magit-diff-while-amending args)))))
- (quit))))
+ (message "Diffing changes to be committed (C-g to abort diffing)")
+ (let ((inhibit-quit nil))
+ (condition-case nil
+ (magit-commit-diff-1)
+ (quit)))))
+
+(defun magit-commit-diff-1 ()
+ (let ((args (car (magit-diff-arguments))))
+ (progn
+ (let ((magit-inhibit-save-previous-winconf 'unset)
+ (magit-display-buffer-noselect t)
+ (display-buffer-overriding-action
+ display-buffer-overriding-action))
+ (when magit-commit-diff-inhibit-same-window
+ (setq display-buffer-overriding-action
+ '(nil (inhibit-same-window t))))
+ (cl-case last-command
+ (magit-commit-create
+ (magit-diff-staged nil args))
+ (magit-commit--all
+ (magit-diff-working-tree nil args))
+ ((magit-commit-amend
+ magit-commit-reword
+ magit-rebase-reword-commit)
+ (magit-diff-while-amending args))
+ (t (if (magit-anything-staged-p)
+ (magit-diff-staged nil args)
+ (magit-diff-while-amending args))))))))
;; Mention `magit-diff-while-committing' because that's
;; always what I search for when I try to find this line.
- [nongnu] elpa/git-commit updated (9b48dd7e36 -> 2dfeaa6839), ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit e0abcbd22f 01/10: Change name of fake command used when adding --all argument, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit e400987d1f 05/10: Remove outdated commit-diff comment, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit 41b08daabf 08/10: magit-commit-diff-1: Determine arguments only here, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit c0f4e43c58 02/10: magit-commit-diff: Fix name of a supported command, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit f34913f669 06/10: magit-diff-refresh-buffer: Use nicer title while committing --all, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit 3af07129bc 09/10: magit-commit-diff: Remember commit command, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit 2dfeaa6839 10/10: magit-commit-diff-1: Use different heuristics, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit 34365a2c5c 03/10: magit-commit-assert: Use --all instead of explicitly staging all, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit c9a738f7d3 04/10: magit-commit-diff-1: New function,
ELPA Syncer <=
- [nongnu] elpa/git-commit 3ebc4e84db 07/10: magit-diff-refresh-buffer: Fix magit-set-header-line-format, ELPA Syncer, 2022/06/07