git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michal Sojka <sojkam1@fel.cvut.cz>
To: git@vger.kernel.org
Cc: "David Kågedal" <davidk@lysator.liu.se>,
	"Lawrence Mitchell" <wence@gmx.li>,
	"Rüdiger Sonderfeld" <ruediger@c-plusplus.de>,
	"Michal Sojka" <sojkam1@fel.cvut.cz>
Subject: [PATCH 2/4] git-blame.el: Make all line prefixes to have the same length
Date: Tue,  2 Jul 2013 19:34:35 +0200	[thread overview]
Message-ID: <1372786477-13122-3-git-send-email-sojkam1@fel.cvut.cz> (raw)
In-Reply-To: <1372786477-13122-1-git-send-email-sojkam1@fel.cvut.cz>

Without this patch, the beginning of git-blame.el in emacs buffer looks
like this (note the Messige-ID line):

b52ba1   <jnareb@gmail.com>:;; Authors:    David Kågedal <davidk@lysator.liu.se>
b52ba1   <jnareb@gmail.com>:;; Created:    31 Jan 2007
28389d <davidk@lysator.liu.se>:;; Message-ID: <87iren2vqx.fsf@morpheus.local>
b52ba1   <jnareb@gmail.com>:;; License:    GPL
b52ba1   <jnareb@gmail.com>:;; Keywords:   git, version control, release management

With this patch, all lines are aligned even if email addresses have
different length.

b52ba1   <jnareb@gmail.com>:   ;; Authors:    David Kågedal <davidk@lysator.liu.se>
b52ba1   <jnareb@gmail.com>:   ;; Created:    31 Jan 2007
28389d <davidk@lysator.liu.se> ;; Message-ID: <87iren2vqx.fsf@morpheus.local>
b52ba1   <jnareb@gmail.com>:   ;; License:    GPL
b52ba1   <jnareb@gmail.com>:   ;; Keywords:   git, version control, release management


Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
---
 contrib/emacs/git-blame.el | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/contrib/emacs/git-blame.el b/contrib/emacs/git-blame.el
index 18ce241..573f408 100644
--- a/contrib/emacs/git-blame.el
+++ b/contrib/emacs/git-blame.el
@@ -116,6 +116,15 @@ mode. The format is passed to `format-spec' with the following format keys:
 "
   :group 'git-blame)
 
+(defcustom git-blame-prefix-width
+  "%-30.30s "
+  "The format for post-processing the prefix produced according
+to `git-blame-prefix-format'. This format is passed to `format'
+function. The default value ensures that all prefixes have the
+same length, i.e. the it causes the prefix to be either truncated
+or padded to 30 characters.
+"
+  :group 'git-blame)
 (defcustom git-blame-mouseover-format
   "%h %a %A: %s"
   "The format of the description shown when pointing at a line in
@@ -410,8 +419,9 @@ See also function `git-blame-mode'."
               (overlay-put ovl 'face (list :background
                                            (cdr (assq 'color (cdr info))))))
           (overlay-put ovl 'line-prefix
-                       (propertize (format-spec git-blame-prefix-format spec)
-                                   'face 'git-blame-prefix-face)))))))
+                       (propertize (format git-blame-prefix-width
+					   (format-spec git-blame-prefix-format spec))
+					   'face 'git-blame-prefix-face)))))))
 
 (defun git-blame-add-info (info key value)
   (nconc info (list (cons (intern key) value))))
-- 
1.8.3.1

  parent reply	other threads:[~2013-07-02 17:43 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-02 17:34 [PATCH 0/4] Emacs: git-blame.el fixes and enhancements Michal Sojka
2013-07-02 17:34 ` [PATCH 1/4] git-blame.el: Fix buffer local declaration Michal Sojka
2013-07-02 17:34 ` Michal Sojka [this message]
2013-07-02 17:34 ` [PATCH 3/4] git-blame.el: Allow displaying author/commit times Michal Sojka
2013-07-02 17:34 ` [PATCH 4/4] git-blame.el: Change the default prefix format Michal Sojka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1372786477-13122-3-git-send-email-sojkam1@fel.cvut.cz \
    --to=sojkam1@fel.cvut.cz \
    --cc=davidk@lysator.liu.se \
    --cc=git@vger.kernel.org \
    --cc=ruediger@c-plusplus.de \
    --cc=wence@gmx.li \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).