merge trunktip_415

1 files changed, 13 insertions, 8 deletions

diff --git a/tests/option.test b/tests/option.test
index 66df70c..ea5b5d1 100644
--- a/tests/option.test
+++ b/tests/option.test
@@ -384,30 +384,35 @@ test option-15.6 {database files} -body {
 	option get . x6 color
 } -result {}
 test option-15.7 {database files} -body {
+    option read $option1
+	option get . x9 color
+} -result " \t\\A\n"
+test option-15.8 {database files} -body {
     option read $option1 widget foo
 } -returnCodes error -result {wrong # args: should be "option readfile fileName ?priority?"}
-
-test option-15.8 {database files} -body {
+test option-15.9 {database files} -body {
     option add *x3 burgundy
     catch {option read $option1 userDefault}
     option get . x3 color
 } -result burgundy
-test option-15.9 {database files} -body {
+test option-15.10 {database files} -body {
     set option2 [file join [testsDirectory] option.file2]
     option read $option2
 } -returnCodes error -result {missing colon on line 2}
-
+set option3 [file join [testsDirectory] option.file3]
+option read $option3
+test option-15.11 {database files} {option get . {x 4} color} br\xf3wn
 
 test option-16.1 {ReadOptionFile} -body {
-    set option3 [makeFile {} option.file3]
-    set file [open $option3 w]
+    set option4 [makeFile {} option.file3]
+    set file [open $option4 w]
     fconfigure $file -translation crlf
     puts $file "*x7: true\n*x8: false"
     close $file
-    option read $option3 userDefault
+    option read $option4 userDefault
     list [option get . x7 color] [option get . x8 color]
 } -cleanup {
-    removeFile $option3
+    removeFile $option4
 } -result {true false}
 
 deleteWindows