diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-27 15:21:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-27 15:21:16 (GMT) |
| commit | 8982d2a60381e8ad4eb9305272f572d939a5d097 (patch) | |
| tree | 5bc0701b49839f4c2039e46686b5432d58c23b2d /unix | |
| parent | f43df857228b616f87644802136c05915d59d48b (diff) | |
| parent | 506ee2fc81bb27e237860565c11a1494ab8c7b38 (diff) | |
| download | tk-8982d2a60381e8ad4eb9305272f572d939a5d097.zip tk-8982d2a60381e8ad4eb9305272f572d939a5d097.tar.gz tk-8982d2a60381e8ad4eb9305272f572d939a5d097.tar.bz2 | |
Merge core-8-6-branch. More surrogate handling, e.g. in HandleIMEComposition()
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixRFont.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index edcfc8a..41cd096 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.c @@ -778,7 +778,7 @@ LookUpColor(Display *display, /* Display to lookup colors on */ i >= 0; last2 = last, last = i, i = fontPtr->colors[i].next) { if (pixel == fontPtr->colors[i].color.pixel) { - /* + /* * Color found in cache. Move it to the front of the list and return it. */ if (last >= 0) { @@ -802,7 +802,7 @@ LookUpColor(Display *display, /* Display to lookup colors on */ last = fontPtr->ncolors++; } - /* + /* * Translate the pixel value to a color. Needs a server round-trip. */ xcolor.pixel = pixel; |