From: Bert Wesarg <bert.wesarg@googlemail.com>
To: Pat Thoyts <patthoyts@users.sourceforge.net>
Cc: Bert Wesarg <bert.wesarg@googlemail.com>,
"Shawn O . Pearce" <spearce@spearce.org>,
git@vger.kernel.org
Subject: [PATCH] git-gui: support for underline styles
Date: Mon, 15 Nov 2010 11:04:58 +0100 [thread overview]
Message-ID: <1289815498-12287-1-git-send-email-bert.wesarg@googlemail.com> (raw)
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---
git-gui/git-gui.sh | 4 ++++
git-gui/lib/diff.tcl | 3 ++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index d3acf0d..70c0483 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -3328,6 +3328,10 @@ foreach {n c} {0 black 1 red4 2 green4 3 yellow4 4 blue4 5 magenta4 6 cyan4 7 gr
$ui_diff tag configure clri4$n -foreground $c
$ui_diff tag configure clr3$n -foreground $c
$ui_diff tag configure clri3$n -background $c
+ $ui_diff tag configure clru4$n -underline 1 -background $c
+ $ui_diff tag configure clrui4$n -underline 1 -foreground $c
+ $ui_diff tag configure clru3$n -underline 1 -foreground $c
+ $ui_diff tag configure clrui3$n -underline 1 -background $c
}
$ui_diff tag configure clr1 -font font_diffbold
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index dcf0711..f59477f 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -463,7 +463,8 @@ proc read_diff {fd cont_info} {
foreach {posbegin colbegin posend colend} $markup {
set prefix clr
- foreach style [split $colbegin ";"] {
+ foreach style [lsort -integer [split $colbegin ";"]] {
+ if {$style eq "4"} {append prefix u; continue}
if {$style eq "7"} {append prefix i; continue}
if {$style < 30 || $style > 47} {continue}
set a "$mark linestart + $posbegin chars"
--
tg: (6f10c41..) bw/git-gui/support-underline-ansi-styles (depends on: master)
next reply other threads:[~2010-11-15 10:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-15 10:04 Bert Wesarg [this message]
2010-11-19 10:00 ` [PATCH] git-gui: support for underline styles Pat Thoyts
2010-11-19 10:55 ` Bert Wesarg
2011-02-27 20:04 ` Bert Wesarg
2011-03-30 6:44 ` [PATCH 1/2] " Bert Wesarg
-- strict thread matches above, loose matches on Subject: below --
2010-11-16 7:49 [PATCH] git-gui: respect conflict marker size Bert Wesarg
2010-11-16 9:21 ` [PATCHv2 1/2] " Bert Wesarg
2010-11-16 9:26 ` [PATCH 2/2] git-gui: support for diff3 conflict style Bert Wesarg
2010-11-19 11:41 ` Pat Thoyts
2010-11-19 12:05 ` Bert Wesarg
2011-02-27 20:15 ` Bert Wesarg
2011-03-30 6:44 ` Bert Wesarg
2011-03-30 7:18 ` [PATCH 2v2/2] " Bert Wesarg
2011-10-20 19:35 ` Bert Wesarg
2010-11-19 11:20 ` [PATCHv2 1/2] git-gui: respect conflict marker size Pat Thoyts
2010-11-19 11:48 ` Bert Wesarg
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=1289815498-12287-1-git-send-email-bert.wesarg@googlemail.com \
--to=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=patthoyts@users.sourceforge.net \
--cc=spearce@spearce.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.