diff options
| -rwxr-xr-x | .gitattributes | 10 | ||||
| -rw-r--r-- | generic/tclExecute.c | 2 | ||||
| -rw-r--r-- | tests/io.test | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes index 82bed50..e9a67c8 100755 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,6 @@ # Set the default behavior, in case people don't have core.autocrlf set. -* text eol=lf +* eol=lf +* text=auto # Explicitly declare text files you want to always be normalized and converted # to native line endings on checkout. @@ -20,15 +21,16 @@ *.test text # Declare files that will always have CRLF line endings on checkout. -*.bat text eol=crlf -*.sln text eol=crlf -*.vc text eol=crlf +*.bat eol=crlf +*.sln eol=crlf +*.vc eol=crlf # Denote all files that are truly binary and should not be modified. *.a binary *.dll binary *.exe binary *.gif binary +*.gz binary *.jpg binary *.lib binary *.pdf binary diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 81173da..779f4a2 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -2224,9 +2224,9 @@ TEBCresume( goto abnormalReturn; } if (codePtr->flags & TCL_BYTECODE_RECOMPILE) { - iPtr->flags |= ERR_ALREADY_LOGGED; codePtr->flags &= ~TCL_BYTECODE_RECOMPILE; checkInterp = 1; + iPtr->flags |= ERR_ALREADY_LOGGED; } if (result != TCL_OK) { diff --git a/tests/io.test b/tests/io.test index 0a9439b..d760f06 100644 --- a/tests/io.test +++ b/tests/io.test @@ -8021,7 +8021,7 @@ test io-53.17 {[7c187a3773] MBWrite: proper inQueueTail handling} -setup { removeFile out } -result {line 100 line} -test io-54.1 {Recursive channel events} {socket fileevent} { +test io-54.1 {Recursive channel events} {socket fileevent knownMsvcBug} { # This test checks to see if file events are delivered during recursive # event loops when there is buffered data on the channel. |