diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-19 16:25:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-19 16:25:29 (GMT) |
| commit | 13b2c628195ebf4fa696dbfe3eaa54e95b3cc529 (patch) | |
| tree | 2e1457468f29e0716c78635ffac3fb31973f9541 /library | |
| parent | b9b549c629dec05a3812bdd812dca3688c1f5ba9 (diff) | |
| parent | 2e563e6660d0175319b9b2d9abdb240599c2cd92 (diff) | |
| download | tk-13b2c628195ebf4fa696dbfe3eaa54e95b3cc529.zip tk-13b2c628195ebf4fa696dbfe3eaa54e95b3cc529.tar.gz tk-13b2c628195ebf4fa696dbfe3eaa54e95b3cc529.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'library')
| -rw-r--r-- | library/demos/unicodeout.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/demos/unicodeout.tcl b/library/demos/unicodeout.tcl index bf5dc6d..25ee932 100644 --- a/library/demos/unicodeout.tcl +++ b/library/demos/unicodeout.tcl @@ -134,7 +134,7 @@ addSample $w Russian \ if {[package vsatisfies [package provide Tcl] 8.7-]} { addSample $w Emoji \ "\U1F600\U1F4A9\U1F44D\U1F1F3\U1F1F1" -} elseif {[tk windowingsystem] ne "x11"} { +} elseif {([tk windowingsystem] ne "x11") || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))} { addSample $w Emoji \ "\uD83D\uDE00\uD83D\uDCA9\uD83D\uDC4D\uD83C\uDDF3\uD83C\uDDF1" } |