Merge git://git.kernel.org/pub/scm/gitk/gitk

Junio C Hamano · Junio C Hamano · commit d69dc373cbf5 · 2006-04-07T16:52:59.000-07:00
* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix incorrect invocation of getmergediffline
  [PATCH] gitk: Fix searching for filenames in gitk
diff --git a/gitk b/gitk
@@ -2230,7 +2230,7 @@ proc donefilediff {} {
     }
 }
 
-proc findcont {id} {
+proc findcont {} {
     global findid treediffs parentlist
     global ffileline findstartline finddidsel
     global displayorder numcommits matchinglines findinprogress
@@ -2700,7 +2700,7 @@ proc getmergediffline {mdf id np} {
 	incr nextupdate 100
 	fileevent $mdf readable {}
 	update
-	fileevent $mdf readable [list getmergediffline $mdf $id]
+	fileevent $mdf readable [list getmergediffline $mdf $id $np]
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2230,7 +2230,7 @@ proc donefilediff {} {`
`2230`	`2230`	`}`
`2231`	`2231`	`}`
`2232`	`2232`
`2233`		`-proc findcont {id} {`
	`2233`	`+proc findcont {} {`
`2234`	`2234`	`global findid treediffs parentlist`
`2235`	`2235`	`global ffileline findstartline finddidsel`
`2236`	`2236`	`global displayorder numcommits matchinglines findinprogress`
`@@ -2700,7 +2700,7 @@ proc getmergediffline {mdf id np} {`
`2700`	`2700`	`incr nextupdate 100`
`2701`	`2701`	`fileevent $mdf readable {}`
`2702`	`2702`	`update`
`2703`		`- fileevent $mdf readable [list getmergediffline $mdf $id]`
	`2703`	`+ fileevent $mdf readable [list getmergediffline $mdf $id $np]`
`2704`	`2704`	`}`
`2705`	`2705`	`}`
`2706`	`2706`