From: Alpha-Bugzilla (alpha-bugzilla+append@ics.mq.edu.au)
Date: 7 Mar 01, 12:54 EST
From: Alpha-Bugzilla <alpha-bugzilla+append@ics.mq.edu.au>
Subject: [Alpha-Bugzilla Bug 213] Diff::View fails with files of different last line
[This e-mail has been automatically generated.]
http://www.maths.mq.edu.au/~steffen/Alpha/bugzilla/show_bug.cgi?id=213
------- Additional Comments From steffen@maths.mq.edu.au 2001-03-07 12:54 -------
Hmm... very strange. 'viewDiff' in Alpha 6.52 has no problem whatsoever.
I would suggest you to go back to 'viewDiff' in Alpha 6.52.
Mark
proc viewDiff {} {
global diffOne diffTwo diffDir
set text [getText [lineStart [getPos]] [expr [nextLineStart
[getPos]] - 1]]
if {![regexp {[acd]} $text char]} return
set res [split $text $char]
if {![scan [lindex $res 0] "%d,%d" one oned]} return
if {![scan [lindex $res 1] "%d,%d" two twod]} return
set on $one
set tw $two
if {$on == 1} {incr on}
if {$tw == 1} {incr tw}
if {![info exists oned]} {set oned $one}
if {![info exists twod]} {set twod $two}
if {$diffDir} {
set res [search -s -f 0 -r 1 "^diff.*\r" [getPos]]
set text [eval getText $res]
set diffOne [lindex $text 1]
set diffTwo [lindex $text 2]
}
diffSel $diffOne [expr $on - 1] $one $oned 1
diffSel $diffTwo [expr $tw - 1] $two $twod 0
if {$diffDir} {
catch {bringToFront "* Directory Comparison *"}
} else {
catch {bringToFront "* File Comparison *"}
}
}
proc diffSel {wname ro row rowd left} {
global diffDir
if {$diffDir} {
set geo [diffGeo $left]
if {[set res [lsearch [winNames -f] "$wname*"]] < 0} {
eval edit -g $geo [list $wname]
set wname [car [winNames -f]]
} else {
set wname [lindex [winNames -f] $res]
if {[getGeometry $wname] != $geo} {
sizeWin $wname [lindex $geo 2] [lindex $geo 3]
moveWin $wname [lindex $geo 0] [lindex $geo 1]
}
}
}
bringToFront $wname
display [rowColToPos $ro 0]
select [rowColToPos $row 0] [rowColToPos [expr $rowd + 1] 0]
}
--
This e-mail has been sent to you by the Alpha-Bugzilla bugsystem
(http://www.maths.mq.edu.au/~steffen/Alpha/bugzilla/)
I am an automated system, please direct your replies or
complaints to my maintainer <steffen@maths.mq.edu.au>
_______________________________________________
AlphaTcl-developers mailing list
AlphaTcl-developers@lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/alphatcl-developers