From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 9 Jul 2007 01:10:03 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc1~16^2~33
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4ca131250c9e56efec638831d6157aaf4f130be9?hp=-c

Merge branch 'maint'

* maint:
git-gui: Skip nicknames when selecting author initials
---

4ca131250c9e56efec638831d6157aaf4f130be9
diff --combined lib/blame.tcl
index dcdb11b1b6,1d2caac283..76b5168fb3
--- a/lib/blame.tcl
+++ b/lib/blame.tcl
@@@ -33,13 -33,6 +33,13 @@@ variable group_colors 
  	#ececec
  }
  
 +# Switches for original location detection
 +#
 +variable original_options [list -C -C]
 +if {[git-version >= 1.5.3]} {
 +	lappend original_options -w ; # ignore indentation changes
 +}
 +
  # Current blame data; cleared/reset on each load
  #
  field commit               ; # input commit to blame
@@@ -311,9 -304,8 +311,9 @@@ constructor new {i_commit i_path} 
  
  	set req_w [winfo reqwidth  $top]
  	set req_h [winfo reqheight $top]
 +	set scr_h [expr {[winfo screenheight $top] - 100}]
  	if {$req_w < 600} {set req_w 600}
 -	if {$req_h < 400} {set req_h 400}
 +	if {$req_h < $scr_h} {set req_h $scr_h}
  	set g "${req_w}x${req_h}"
  	wm geometry $top $g
  	update
@@@ -519,7 -511,6 +519,7 @@@ method _exec_blame {cur_w cur_d option
  method _read_blame {fd cur_w cur_d cur_s} {
  	upvar #0 $cur_d line_data
  	variable group_colors
 +	variable original_options
  
  	if {$fd ne $current_fd} {
  		catch {close $fd}
@@@ -556,6 -547,10 +556,10 @@@
  			set a_name {}
  			catch {set a_name $header($cmit,author)}
  			while {$a_name ne {}} {
+ 				if {$author_abbr ne {}
+ 					&& [string index $a_name 0] eq {'}} {
+ 					regsub {^'[^']+'\s+} $a_name {} a_name
+ 				}
  				if {![regexp {^([[:upper:]])} $a_name _a]} break
  				append author_abbr $_a
  				unset _a
@@@ -689,7 -684,7 +693,7 @@@
  		close $fd
  		if {$cur_w eq $w_asim} {
  			_exec_blame $this $w_amov @amov_data \
 -				[list -M -C -C] \
 +				$original_options \
  				{ original location}
  		} else {
  			set current_fd {}