emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/git-commit 17d2bf5cee 3/4: magit-diff{, -refresh}: Rearran


From: ELPA Syncer
Subject: [nongnu] elpa/git-commit 17d2bf5cee 3/4: magit-diff{, -refresh}: Rearrange arguments
Date: Thu, 7 Sep 2023 18:59:29 -0400 (EDT)

branch: elpa/git-commit
commit 17d2bf5cee57c81ae1c801f995d415f252c12f4c
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    magit-diff{,-refresh}: Rearrange arguments
    
    Move arguments for using an external diff driver and showing
    additional information after all arguments that tweak the look
    of the diff.
---
 lisp/magit-diff.el | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index cfedfecd19..5f88922aa1 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -900,12 +900,12 @@ and `:slant'."
    (magit-diff:--diff-algorithm)
    (magit-diff:-M)
    (magit-diff:-C)
-   ("-x" "Disallow external diff drivers" "--no-ext-diff")
-   ("-s" "Show stats"                     "--stat")
-   ("=g" "Show signature"                 "--show-signature")
    (5 "-R" "Reverse sides"                "-R")
    (5 magit-diff:--color-moved)
-   (5 magit-diff:--color-moved-ws)]
+   (5 magit-diff:--color-moved-ws)
+   ("-x" "Disallow external diff drivers" "--no-ext-diff")
+   ("-s" "Show stats"                     "--stat")
+   ("=g" "Show signature"                 "--show-signature")]
   ["Actions"
    [("d" "Dwim"          magit-diff-dwim)
     ("r" "Diff range"    magit-diff-range)
@@ -934,15 +934,15 @@ and `:slant'."
    (magit-diff:--diff-algorithm)
    (magit-diff:-M)
    (magit-diff:-C)
+   (5 "-R" "Reverse sides"                "-R"
+      :if-derived magit-diff-mode)
+   (5 magit-diff:--color-moved)
+   (5 magit-diff:--color-moved-ws)
    ("-x" "Disallow external diff drivers" "--no-ext-diff")
    ("-s" "Show stats"                     "--stat"
     :if-derived magit-diff-mode)
    ("=g" "Show signature"                 "--show-signature"
-    :if-derived magit-diff-mode)
-   (5 "-R" "Reverse sides"                "-R"
-      :if-derived magit-diff-mode)
-   (5 magit-diff:--color-moved)
-   (5 magit-diff:--color-moved-ws)]
+    :if-derived magit-diff-mode)]
   [["Refresh"
     ("g" "buffer"                   magit-diff-refresh)
     ("s" "buffer and set defaults"  transient-set  :transient nil)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]