summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-20 19:12:03 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-20 19:12:03 (GMT)
commit6fe122b85ba48c99870e5fa8f7aee51252c06992 (patch)
tree0225d060617f94242d02b02d08ba8655d2961a7c /generic
parent3eb1054ae6c7e06a382e8d3bac9d55cf4a7c7857 (diff)
parentc474dae757819195f58b98303f5ceb73eba231f0 (diff)
downloadtk-6fe122b85ba48c99870e5fa8f7aee51252c06992.zip
tk-6fe122b85ba48c99870e5fa8f7aee51252c06992.tar.gz
tk-6fe122b85ba48c99870e5fa8f7aee51252c06992.tar.bz2
merge core-8-6-branch
Diffstat (limited to 'generic')
-rw-r--r--generic/tkFont.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c
index d1ef3cf..3c2b4f9 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -3935,6 +3935,7 @@ TkFontParseXLFD(
} else if (Tcl_GetInt(NULL, field[XLFD_PIXEL_SIZE],
&i) == TCL_OK) {
faPtr->size = (double)i;
+ } else {
return TCL_ERROR;
}
}