Merge core-8-6-branch

2 files changed, 21 insertions, 2 deletions

diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index e85f512..e93dab4 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -797,6 +797,23 @@ test imgPhoto-4.73 {ImgPhotoCmd procedure: copy with -compositingrule} -setup {
 } -cleanup {
     image delete photo1 photo2
 } -result {0,2 1,1 2,0}
+test imgPhoto-4.74 {ImgPhotoCmd procedure: put option error handling} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{white}} -to 10 10 20 20 {{white}}
+} -cleanup {
+    image delete photo1
+} -returnCodes 1 -result {wrong # args: should be "photo1 put data ?-option value ...?"}
+test imgPhoto-4.75 {<photo> read command: filename starting with '-'} -constraints {
+    hasTeapotPhoto 
+} -body {
+    file copy -force $teapotPhotoFile -teapotPhotoFile
+    image create photo photo1
+    photo1 read -teapotPhotoFile
+} -cleanup {
+    image delete photo1
+    file delete ./-teapotPhotoFile
+} -result {}
 
 test imgPhoto-5.1 {ImgPhotoGet/Free procedures, shared instances} -constraints {
     hasTeapotPhoto 
diff --git a/tests/textDisp.test b/tests/textDisp.test
index d3de2d8..8342c46 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -1952,13 +1952,15 @@ test textDisp-15.8 {Scrolling near end of window} {
 	.tf.f.t insert end "\nLine $i"
     }
     update ; after 1000 ; update
+    set refind [.tf.f.t index @0,[winfo height .tf.f.t]]
     # Should scroll and should not crash!
     .tf.f.t yview scroll 1 unit
     # Check that it has scrolled
-    set res [.tf.f.t index @0,[expr [winfo height .tf.f.t] - 15]]
+    set newind [.tf.f.t index @0,[winfo height .tf.f.t]]
+    set res [.tf.f.t compare $newind > $refind]
     destroy .tf
     set res
-} {12.0}
+} {1}
 
 .t configure -wrap char
 .t delete 1.0 end