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

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

[nongnu] elpa/git-commit cba35acb02: Whitespace cosmetics


From: ELPA Syncer
Subject: [nongnu] elpa/git-commit cba35acb02: Whitespace cosmetics
Date: Fri, 17 Mar 2023 11:02:28 -0400 (EDT)

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

    Whitespace cosmetics
    
    A few releases ago Emacs started highlighting such trailing tokens
    with `font-lock-warning-face'.  That reduces readability more than
    needlessly putting them on a separate line.
---
 lisp/magit-sequence.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el
index 127e788ac2..aa32b70a21 100644
--- a/lisp/magit-sequence.el
+++ b/lisp/magit-sequence.el
@@ -1041,10 +1041,12 @@ status buffer (i.e. the reverse of how they will be 
applied)."
                (cond
                 ;; ...but we could end up at the same tree just by committing.
                 ((or (magit-rev-equal staged   stop)
-                     (magit-rev-equal unstaged stop)) "goal")
+                     (magit-rev-equal unstaged stop))
+                 "goal")
                 ;; ...but the changes are still there, untainted.
                 ((or (equal (magit-patch-id staged)   id)
-                     (equal (magit-patch-id unstaged) id)) "same")
+                     (equal (magit-patch-id unstaged) id))
+                 "same")
                 ;; ...and some changes are gone and/or others were added.
                 (t "work")))
              stop 'magit-sequence-part))



reply via email to

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