summaryrefslogtreecommitdiffstats
path: root/generic/tkTextTag.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-01-13 14:51:58 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-01-13 14:51:58 (GMT)
commit40b76dbd4f4479294a9cd461da0400e31734ac2b (patch)
tree0b9c811cef1183d76e05a6ac238b5652de5bb12d /generic/tkTextTag.c
parentad423a347178d6279b112f7031e683c7e15d798a (diff)
parent75aab96f3ddb340be5aecbb880f1af2a07d9ec25 (diff)
downloadtk-40b76dbd4f4479294a9cd461da0400e31734ac2b.zip
tk-40b76dbd4f4479294a9cd461da0400e31734ac2b.tar.gz
tk-40b76dbd4f4479294a9cd461da0400e31734ac2b.tar.bz2
Merge 8.7
Diffstat (limited to 'generic/tkTextTag.c')
-rw-r--r--generic/tkTextTag.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c
index d04c71d..25e6af1 100644
--- a/generic/tkTextTag.c
+++ b/generic/tkTextTag.c
@@ -516,7 +516,7 @@ TkTextTagCmd(
tagPtr->affectsDisplay = 0;
tagPtr->affectsDisplayGeometry = 0;
if ((tagPtr->elideString != NULL)
- || (tagPtr->tkfont != None)
+ || (tagPtr->tkfont != NULL)
|| (tagPtr->justifyString != NULL)
|| (tagPtr->lMargin1String != NULL)
|| (tagPtr->lMargin2String != NULL)