From 26107dda6f20f68ec801583696f818a015997f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Fri, 24 Sep 2010 21:19:58 +0000 Subject: [PATCH] magit-refresh-status: align messages for rebase message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "Rebasing:" was the longest message, but the status bar wasn't aligned before, now this: Local: (detached) ~/g/git/ Head: c6b2a51 gettextize: git-clone "Cloning into" message Rebasing: onto master (26 of 159); Press "R" to Abort, Skip, or Continue Is aligned like this: Local: (detached) ~/g/git/ Head: c6b2a51 gettextize: git-clone "Cloning into" message Rebasing: onto master (26 of 159); Press "R" to Abort, Skip, or Continue Signed-off-by: Ævar Arnfjörð Bjarmason --- magit.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/magit.el b/magit.el index 002c8c5e..d1837a83 100644 --- a/magit.el +++ b/magit.el @@ -2641,16 +2641,16 @@ insert a line to tell how to insert more of them" "log" "--max-count=1" "--abbrev-commit" "--pretty=oneline")) (no-commit (not head))) (when remote-string - (insert "Remote: " remote-string "\n")) - (insert (format "Local: %s %s\n" + (insert "Remote: " remote-string "\n")) + (insert (format "Local: %s %s\n" (propertize (or branch "(detached)") 'face 'magit-branch) (abbreviate-file-name default-directory))) - (insert (format "Head: %s\n" + (insert (format "Head: %s\n" (if no-commit "nothing commited (yet)" head))) (let ((merge-heads (magit-file-lines ".git/MERGE_HEAD"))) (if merge-heads - (insert (format "Merging: %s\n" + (insert (format "Merging: %s\n" (magit-concat-with-delim ", " (mapcar 'magit-name-rev merge-heads))))))