Module Name: xsrc
Committed By: mrg
Date: Sun Aug 30 04:53:28 UTC 2020
Modified Files:
xsrc/external/mit/libX11/dist/man: XCreateGC.man
xsrc/external/mit/libX11/dist/modules/im/ximcp: imRmAttr.c
Log Message:
merge libX11 1.6.12.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/man/XCreateGC.man
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/man/XCreateGC.man
diff -u xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.5 xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.6
--- xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.5 Sun Feb 23 09:05:17 2020
+++ xsrc/external/mit/libX11/dist/man/XCreateGC.man Sun Aug 30 04:53:28 2020
@@ -178,7 +178,7 @@ If the valuemask contains a valid set of
.BR GCSubwindowMode ,
.BR GCGraphicsExposures ,
.BR GCClipXOrigin ,
-.BR GCCLipYOrigin ,
+.BR GCClipYOrigin ,
.BR GCDashOffset ,
or
.BR GCArcMode )
Index: xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c
diff -u xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c:1.2 xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c:1.3
--- xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c:1.2 Tue Aug 4 15:47:27 2020
+++ xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c Sun Aug 30 04:53:28 2020
@@ -1407,7 +1407,7 @@ _XimCountNumberOfAttr(
*names_len = 0;
while (total > min_len) {
len = attr[2];
- if (len >= (total - min_len)) {
+ if (len > (total - min_len)) {
return 0;
}
*names_len += (len + 1);
