[nongnu] elpa/git-commit c9a738f7d3 04/10: magit-commit-diff-1: New function

[ELPA Syncer]

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.