diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-04-01 17:07:10 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-04-01 17:07:10 (GMT) |
| commit | d81f8f7c49270ddc93b4d639c0e7f77767c4fd47 (patch) | |
| tree | 64da754277b242dc50862f735d5b4ee523971fa6 /generic/tkTextWind.c | |
| parent | e19cf65c7641a093a5c7cf8325c5466e431d7c69 (diff) | |
| parent | b8f8082aad49088238582658c22248f9469ad055 (diff) | |
| download | tk-d81f8f7c49270ddc93b4d639c0e7f77767c4fd47.zip tk-d81f8f7c49270ddc93b4d639c0e7f77767c4fd47.tar.gz tk-d81f8f7c49270ddc93b4d639c0e7f77767c4fd47.tar.bz2 | |
Merge 8.5. Bring together the compile time and run time Xkb checks.bug_3607830
Diffstat (limited to 'generic/tkTextWind.c')
| -rw-r--r-- | generic/tkTextWind.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c index ecafd4e..8d1f850 100644 --- a/generic/tkTextWind.c +++ b/generic/tkTextWind.c @@ -902,10 +902,10 @@ EmbWinLayoutProc( if (dsPtr != NULL) { Tcl_DStringAppend(dsPtr, before, (int) (string-before)); - code = Tcl_GlobalEval(textPtr->interp, Tcl_DStringValue(dsPtr)); + code = Tcl_EvalEx(textPtr->interp, Tcl_DStringValue(dsPtr), -1, TCL_EVAL_GLOBAL); Tcl_DStringFree(dsPtr); } else { - code = Tcl_GlobalEval(textPtr->interp, ewPtr->body.ew.create); + code = Tcl_EvalEx(textPtr->interp, ewPtr->body.ew.create, -1, TCL_EVAL_GLOBAL); } if (code != TCL_OK) { createError: @@ -1329,6 +1329,10 @@ TkTextWindowIndex( Tcl_HashEntry *hPtr; TkTextSegment *ewPtr; + if (textPtr == NULL) { + return 0; + } + hPtr = Tcl_FindHashEntry(&textPtr->sharedTextPtr->windowTable, name); if (hPtr == NULL) { return 0; |