Merge remote-tracking branch 'origin/released'

* origin/released:
  libX11 mesa git update 18 Mar 2013
  fontconfig libX11 mesa pixman xserver xkeyboard-config git update 11 Mar 2013

16 files changed, 106 insertions, 83 deletions

diff --git a/libX11/configure.ac b/libX11/configure.ac
index 4d7d411ae..7734219f4 100644
--- a/libX11/configure.ac
+++ b/libX11/configure.ac
@@ -1,7 +1,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libX11], [1.5.0],
+AC_INIT([libX11], [1.5.99.901],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
diff --git a/libX11/include/X11/Xlibint.h b/libX11/include/X11/Xlibint.h
index e1a7b33d3..f71692c5d 100644
--- a/libX11/include/X11/Xlibint.h
+++ b/libX11/include/X11/Xlibint.h
@@ -489,6 +489,14 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len);
 	req = (xReq *) _XGetRequest(dpy, X_/**/name, SIZEOF(xReq))
 #endif
 
+/*
+ * MakeBigReq sets the CARD16 "req->length" to 0 and inserts a new CARD32
+ * length, after req->length, before the data in the request.  The new length
+ * includes the "n" extra 32-bit words.
+ *
+ * Do not use MakeBigReq if there is no data already in the request.
+ * req->length must already be >= 2.
+ */
 #ifdef LONG64
 #define MakeBigReq(req,n) \
     { \
@@ -496,7 +504,7 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len);
     CARD32 _BRlen = req->length - 1; \
     req->length = 0; \
     _BRdat = ((CARD32 *)req)[_BRlen]; \
-    memmove(((char *)req) + 8, ((char *)req) + 4, _BRlen << 2); \
+    memmove(((char *)req) + 8, ((char *)req) + 4, (_BRlen - 1) << 2); \
     ((CARD32 *)req)[1] = _BRlen + n + 2; \
     Data32(dpy, &_BRdat, 4); \
     }
@@ -507,12 +515,19 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len);
     CARD32 _BRlen = req->length - 1; \
     req->length = 0; \
     _BRdat = ((CARD32 *)req)[_BRlen]; \
-    memmove(((char *)req) + 8, ((char *)req) + 4, _BRlen << 2); \
+    memmove(((char *)req) + 8, ((char *)req) + 4, (_BRlen - 1) << 2); \
     ((CARD32 *)req)[1] = _BRlen + n + 2; \
     Data32(dpy, &_BRdat, 4); \
     }
 #endif
 
+/*
+ * SetReqLen increases the count of 32-bit words in the request by "n",
+ * or by "badlen" if "n" is too large.
+ *
+ * Do not use SetReqLen if "req" does not already have data after the
+ * xReq header.  req->length must already be >= 2.
+ */
 #ifndef __clang_analyzer__
 #define SetReqLen(req,n,badlen) \
     if ((req->length + n) > (unsigned)65535) { \
diff --git a/libX11/man/XrmEnumerateDatabase.man b/libX11/man/XrmEnumerateDatabase.man
index 843100635..03c0f30e2 100644
--- a/libX11/man/XrmEnumerateDatabase.man
+++ b/libX11/man/XrmEnumerateDatabase.man
@@ -84,6 +84,8 @@
 .SH NAME
 XrmEnumerateDatabase \- enumerate resource database entries
 .SH SYNTAX
+.HP
+#include <X11/Xresource.h>
 .TS
 lw(.5i) lw(2i) lw(2.5i).
 T{
diff --git a/libX11/man/XrmGetFileDatabase.man b/libX11/man/XrmGetFileDatabase.man
index 3a8a6fa82..71ddd9f10 100644
--- a/libX11/man/XrmGetFileDatabase.man
+++ b/libX11/man/XrmGetFileDatabase.man
@@ -93,6 +93,8 @@
 XrmGetFileDatabase, XrmPutFileDatabase, XrmGetStringDatabase, XrmLocaleOfDatabase, XrmGetDatabase, XrmSetDatabase, XrmDestroyDatabase \- retrieve and store resource databases
 .SH SYNTAX
 .HP
+#include <X11/Xresource.h>
+.HP
 XrmDatabase XrmGetFileDatabase\^(\^char *\fIfilename\fP\^); 
 .HP
 void XrmPutFileDatabase\^(\^XrmDatabase \fIdatabase\fP\^, char
diff --git a/libX11/man/XrmGetResource.man b/libX11/man/XrmGetResource.man
index 76ca9218c..ef2cf9ada 100644
--- a/libX11/man/XrmGetResource.man
+++ b/libX11/man/XrmGetResource.man
@@ -85,6 +85,8 @@
 XrmGetResource, XrmQGetResource, XrmQGetSearchList, XrmQGetSearchResource \- retrieve database resources and search lists
 .SH SYNTAX
 .HP
+#include <X11/Xresource.h>
+.HP
 Bool XrmGetResource\^(\^XrmDatabase \fIdatabase\fP\^, char *\fIstr_name\fP\^,
 char *\fIstr_class\fP\^, char **\fIstr_type_return\fP\^, XrmValue
 *\fIvalue_return\fP\^); 
diff --git a/libX11/man/XrmInitialize.man b/libX11/man/XrmInitialize.man
index b8b549db6..3b3ddd78b 100644
--- a/libX11/man/XrmInitialize.man
+++ b/libX11/man/XrmInitialize.man
@@ -83,6 +83,8 @@
 XrmInitialize, XrmParseCommand, XrmValue, XrmOptionKind, XrmOptionDescRec \- initialize the Resource Manager, Resource Manager structures, and parse the command line
 .SH SYNTAX
 .HP
+#include <X11/Xresource.h>
+.HP
 void XrmInitialize\^(void\^);
 .HP
 void XrmParseCommand\^(\^XrmDatabase *\fIdatabase\fP\^, XrmOptionDescList
diff --git a/libX11/man/XrmMergeDatabases.man b/libX11/man/XrmMergeDatabases.man
index 57a6578ec..41b27bb63 100644
--- a/libX11/man/XrmMergeDatabases.man
+++ b/libX11/man/XrmMergeDatabases.man
@@ -83,6 +83,8 @@
 XrmMergeDatabases, XrmCombineDatabase, XrmCombineFileDatabase \- merge resource databases
 .SH SYNTAX
 .HP
+#include <X11/Xresource.h>
+.HP
 void XrmMergeDatabases(\^XrmDatabase \fIsource_db\fP, XrmDatabase
 *\fItarget_db\fP\^); 
 .HP
diff --git a/libX11/man/XrmPutResource.man b/libX11/man/XrmPutResource.man
index 9f9d08884..fd644630d 100644
--- a/libX11/man/XrmPutResource.man
+++ b/libX11/man/XrmPutResource.man
@@ -83,6 +83,8 @@
 XrmPutResource, XrmQPutResource, XrmPutStringResource, XrmQPutStringResource, XrmPutLineResource \- store database resources
 .SH SYNTAX
 .HP
+#include <X11/Xresource.h>
+.HP
 void XrmPutResource\^(\^XrmDatabase *\fIdatabase\fP\^, char
 *\fIspecifier\fP\^, char *\fItype\fP\^, XrmValue *\fIvalue\fP\^); 
 .HP
diff --git a/libX11/man/XrmUniqueQuark.man b/libX11/man/XrmUniqueQuark.man
index 383d26c50..93755f71b 100644
--- a/libX11/man/XrmUniqueQuark.man
+++ b/libX11/man/XrmUniqueQuark.man
@@ -83,6 +83,8 @@
 XrmUniqueQuark, XrmStringToQuark, XrmPermStringToQuark, XrmQuarkToString, XrmStringToQuarkList, XrmStringToBindingQuarkList \- manipulate resource quarks
 .SH SYNOPSIS
 .HP
+#include <X11/Xresource.h>
+.HP
 XrmQuark XrmUniqueQuark\^(void); 
 .LP
 \&#define XrmStringToName(string) XrmStringToQuark(string)
diff --git a/libX11/nls/Makefile.am b/libX11/nls/Makefile.am
index 0eced4cd8..53eaacdf6 100644
--- a/libX11/nls/Makefile.am
+++ b/libX11/nls/Makefile.am
@@ -37,8 +37,8 @@ locale.dir: locale.dir.pre
 	cat locale.dir.l2 locale.dir.l1 > locale.dir
 
 if HAVE_PERL
-TESTS_ENVIRONMENT = $(PERL)
-TESTS = $(srcdir)/compose-check.pl
+LOG_COMPILER = $(PERL)
+TESTS = compose-check.pl
 endif HAVE_PERL
 
 
diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre
index de24dadec..8b45d920d 100644
--- a/libX11/nls/en_US.UTF-8/Compose.pre
+++ b/libX11/nls/en_US.UTF-8/Compose.pre
@@ -1481,30 +1481,30 @@ XCOMM Part 3
 <Multi_key> <acute> <KP_Divide> <o> 	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <apostrophe> <KP_Divide> <o> 	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 <dead_stroke> <dead_acute> <o>  	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
-<dead_double_grave> <A>                  	: "Ȁ"   U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
-<dead_double_grave> <a>                  	: "ȁ"   U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
-<dead_inverted_breve> <A>                  	: "Ȃ"   U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
-<dead_inverted_breve> <a>                  	: "ȃ"   U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
-<dead_double_grave> <E>                  	: "Ȅ"   U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
-<dead_double_grave> <e>                  	: "ȅ"   U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
-<dead_inverted_breve> <E>                  	: "Ȇ"   U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
-<dead_inverted_breve> <e>                  	: "ȇ"   U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
-<dead_double_grave> <I>                  	: "Ȉ"   U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
-<dead_double_grave> <i>                  	: "ȉ"   U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
-<dead_inverted_breve> <I>                  	: "Ȋ"   U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
-<dead_inverted_breve> <i>                  	: "ȋ"   U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
-<dead_double_grave> <O>                  	: "Ȍ"   U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
-<dead_double_grave> <o>                  	: "ȍ"   U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
-<dead_inverted_breve> <O>                  	: "Ȏ"   U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
-<dead_inverted_breve> <o>                  	: "ȏ"   U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
-<dead_double_grave> <R>                  	: "Ȑ"   U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
-<dead_double_grave> <r>                  	: "ȑ"   U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
-<dead_inverted_breve> <R>                  	: "Ȓ"   U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
-<dead_inverted_breve> <r>                  	: "ȓ"   U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
-<dead_double_grave> <U>                  	: "Ȕ"   U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
-<dead_double_grave> <u>                  	: "ȕ"   U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
-<dead_inverted_breve> <U>                  	: "Ȗ"   U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
-<dead_inverted_breve> <u>                  	: "ȗ"   U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
+<dead_doublegrave> <A>                  	: "Ȁ"   U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+<dead_doublegrave> <a>                  	: "ȁ"   U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
+<dead_invertedbreve> <A>                  	: "Ȃ"   U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
+<dead_invertedbreve> <a>                  	: "ȃ"   U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
+<dead_doublegrave> <E>                  	: "Ȅ"   U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+<dead_doublegrave> <e>                  	: "ȅ"   U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
+<dead_invertedbreve> <E>                  	: "Ȇ"   U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
+<dead_invertedbreve> <e>                  	: "ȇ"   U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
+<dead_doublegrave> <I>                  	: "Ȉ"   U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+<dead_doublegrave> <i>                  	: "ȉ"   U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
+<dead_invertedbreve> <I>                  	: "Ȋ"   U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
+<dead_invertedbreve> <i>                  	: "ȋ"   U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
+<dead_doublegrave> <O>                  	: "Ȍ"   U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+<dead_doublegrave> <o>                  	: "ȍ"   U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
+<dead_invertedbreve> <O>                  	: "Ȏ"   U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
+<dead_invertedbreve> <o>                  	: "ȏ"   U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
+<dead_doublegrave> <R>                  	: "Ȑ"   U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+<dead_doublegrave> <r>                  	: "ȑ"   U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
+<dead_invertedbreve> <R>                  	: "Ȓ"   U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
+<dead_invertedbreve> <r>                  	: "ȓ"   U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
+<dead_doublegrave> <U>                  	: "Ȕ"   U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+<dead_doublegrave> <u>                  	: "ȕ"   U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
+<dead_invertedbreve> <U>                  	: "Ȗ"   U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
+<dead_invertedbreve> <u>                  	: "ȗ"   U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
 <dead_caron> <H>                 	: "Ȟ"   U021E # LATIN CAPITAL LETTER H WITH CARON
 <Multi_key> <c> <H>              	: "Ȟ"   U021E # LATIN CAPITAL LETTER H WITH CARON
 <dead_caron> <h>                 	: "ȟ"   U021F # LATIN SMALL LETTER H WITH CARON
@@ -1784,8 +1784,8 @@ XCOMM Part 3
 <dead_breve> <Cyrillic_u>        	: "ў"   U045E # CYRILLIC SMALL LETTER SHORT U
 <Multi_key> <U> <Cyrillic_u>     	: "ў"   U045E # CYRILLIC SMALL LETTER SHORT U
 <Multi_key> <b> <Cyrillic_u>     	: "ў"   U045E # CYRILLIC SMALL LETTER SHORT U
-<dead_double_grave> <U0474>          	: "Ѷ"   U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-<dead_double_grave> <U0475>          	: "ѷ"   U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<dead_doublegrave> <U0474>          	: "Ѷ"   U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<dead_doublegrave> <U0475>          	: "ѷ"   U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
 <Multi_key> <slash> <Cyrillic_GHE> 	: "Ғ"   U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
 <Multi_key> <KP_Divide> <Cyrillic_GHE> 	: "Ғ"   U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
 <Multi_key> <slash> <Cyrillic_ghe> 	: "ғ"   U0493 # CYRILLIC SMALL LETTER GHE WITH STROKE
diff --git a/libX11/nls/pt_BR.UTF-8/Compose.pre b/libX11/nls/pt_BR.UTF-8/Compose.pre
index b6d7c8acc..9e0ca4e42 100644
--- a/libX11/nls/pt_BR.UTF-8/Compose.pre
+++ b/libX11/nls/pt_BR.UTF-8/Compose.pre
@@ -1086,30 +1086,30 @@ XCOMM <Multi_key> <apostrophe> <o> <a>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH
 <dead_acute> <Multi_key> <KP_Divide> <o>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <acute> <KP_Divide> <o>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 <Multi_key> <apostrophe> <KP_Divide> <o>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
-<dead_double_grave> <A>	: "Ȁ" U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
-<dead_double_grave> <a>	: "ȁ" U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
-<dead_inverted_breve> <A>	: "Ȃ" U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
-<dead_inverted_breve> <a>	: "ȃ" U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
-<dead_double_grave> <E>	: "Ȅ" U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
-<dead_double_grave> <e>	: "ȅ" U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
-<dead_inverted_breve> <E>	: "Ȇ" U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
-<dead_inverted_breve> <e>	: "ȇ" U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
-<dead_double_grave> <I>	: "Ȉ" U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
-<dead_double_grave> <i>	: "ȉ" U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
-<dead_inverted_breve> <I>	: "Ȋ" U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
-<dead_inverted_breve> <i>	: "ȋ" U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
-<dead_double_grave> <O>	: "Ȍ" U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
-<dead_double_grave> <o>	: "ȍ" U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
-<dead_inverted_breve> <O>	: "Ȏ" U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
-<dead_inverted_breve> <o>	: "ȏ" U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
-<dead_double_grave> <R>	: "Ȑ" U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
-<dead_double_grave> <r>	: "ȑ" U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
-<dead_inverted_breve> <R>	: "Ȓ" U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
-<dead_inverted_breve> <r>	: "ȓ" U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
-<dead_double_grave> <U>	: "Ȕ" U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
-<dead_double_grave> <u>	: "ȕ" U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
-<dead_inverted_breve> <U>	: "Ȗ" U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
-<dead_inverted_breve> <u>	: "ȗ" U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
+<dead_doublegrave> <A>	: "Ȁ" U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+<dead_doublegrave> <a>	: "ȁ" U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
+<dead_invertedbreve> <A>	: "Ȃ" U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
+<dead_invertedbreve> <a>	: "ȃ" U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
+<dead_doublegrave> <E>	: "Ȅ" U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+<dead_doublegrave> <e>	: "ȅ" U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
+<dead_invertedbreve> <E>	: "Ȇ" U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
+<dead_invertedbreve> <e>	: "ȇ" U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
+<dead_doublegrave> <I>	: "Ȉ" U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+<dead_doublegrave> <i>	: "ȉ" U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
+<dead_invertedbreve> <I>	: "Ȋ" U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
+<dead_invertedbreve> <i>	: "ȋ" U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
+<dead_doublegrave> <O>	: "Ȍ" U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+<dead_doublegrave> <o>	: "ȍ" U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
+<dead_invertedbreve> <O>	: "Ȏ" U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
+<dead_invertedbreve> <o>	: "ȏ" U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
+<dead_doublegrave> <R>	: "Ȑ" U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+<dead_doublegrave> <r>	: "ȑ" U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
+<dead_invertedbreve> <R>	: "Ȓ" U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
+<dead_invertedbreve> <r>	: "ȓ" U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
+<dead_doublegrave> <U>	: "Ȕ" U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+<dead_doublegrave> <u>	: "ȕ" U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
+<dead_invertedbreve> <U>	: "Ȗ" U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
+<dead_invertedbreve> <u>	: "ȗ" U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
 <dead_belowcomma> <S>	: "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
 <dead_belowcomma> <s>	: "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
 <dead_belowcomma> <T>	: "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
@@ -1371,8 +1371,8 @@ XCOMM <Multi_key> <apostrophe> <o> <a>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH
 <dead_breve> <Cyrillic_u>	: "ў" U045E # CYRILLIC SMALL LETTER SHORT U
 <Multi_key> <U> <Cyrillic_u>	: "ў" U045E # CYRILLIC SMALL LETTER SHORT U
 <Multi_key> <b> <Cyrillic_u>	: "ў" U045E # CYRILLIC SMALL LETTER SHORT U
-<dead_double_grave> <U0474>	: "Ѷ" U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-<dead_double_grave> <U0475>	: "ѷ" U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<dead_doublegrave> <U0474>	: "Ѷ" U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<dead_doublegrave> <U0475>	: "ѷ" U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
 <Multi_key> <slash> <Cyrillic_GHE>	: "Ғ" U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
 <Multi_key> <KP_Divide> <Cyrillic_GHE>	: "Ғ" U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
 <Multi_key> <slash> <Cyrillic_ghe>	: "ғ" U0493 # CYRILLIC SMALL LETTER GHE WITH STROKE
diff --git a/libX11/src/GetFProp.c b/libX11/src/GetFProp.c
index 27ec98b72..1e0cd3285 100644
--- a/libX11/src/GetFProp.c
+++ b/libX11/src/GetFProp.c
@@ -29,27 +29,24 @@ in this Software without prior written authorization from The Open Group.
 #endif
 #include "Xlibint.h"
 
-Bool XGetFontProperty (
+Bool
+XGetFontProperty(
     XFontStruct *fs,
     register Atom name,
     unsigned long *valuePtr)
 {
     /* XXX this is a simple linear search for now.  If the
-      protocol is changed to sort the property list, this should
-      become a binary search. */
+       protocol is changed to sort the property list, this should
+       become a binary search. */
     register XFontProp *prop = fs->properties;
     register XFontProp *last = prop + fs->n_properties;
+
     while (prop != last) {
-	if (prop->name == name) {
-	    *valuePtr = prop->card32;
-	    return (1);
-	    }
-	prop++;
-	}
-    return (0);
+        if (prop->name == name) {
+            *valuePtr = prop->card32;
+            return (1);
+        }
+        prop++;
     }
-
-
-
-
-
+    return (0);
+}
diff --git a/libX11/src/OpenDis.c b/libX11/src/OpenDis.c
index 2e5181811..87a3fc430 100644
--- a/libX11/src/OpenDis.c
+++ b/libX11/src/OpenDis.c
@@ -500,6 +500,9 @@ XOpenDisplay (
 	    return(NULL);
 	}
 
+/*
+ * get availability of large requests
+ */
 	dpy->bigreq_size = xcb_get_maximum_request_length(dpy->xcb->connection);
 	if(dpy->bigreq_size <= dpy->max_request_size)
 		dpy->bigreq_size = 0;
@@ -526,7 +529,6 @@ XOpenDisplay (
 	(void) XSynchronize(dpy, _Xdebug);
 
 /*
- * get availability of large requests, and
  * get the resource manager database off the root window.
  */
 	LockDisplay(dpy);
diff --git a/libX11/src/PropAlloc.c b/libX11/src/PropAlloc.c
index bad768153..516283080 100644
--- a/libX11/src/PropAlloc.c
+++ b/libX11/src/PropAlloc.c
@@ -58,12 +58,7 @@ XWMHints *XAllocWMHints (void)
 
 XClassHint *XAllocClassHint (void)
 {
-    register XClassHint *h;
-
-    if ((h = (XClassHint *) Xcalloc (1, (unsigned) sizeof (XClassHint))))
-      h->res_name = h->res_class = NULL;
-
-    return h;
+    return Xcalloc (1, sizeof (XClassHint));
 }
 
 
diff --git a/libX11/src/udcInf.c b/libX11/src/udcInf.c
index db7ad10f3..b7577ac96 100644
--- a/libX11/src/udcInf.c
+++ b/libX11/src/udcInf.c
@@ -702,14 +702,14 @@ int 		*num_gi;
     _XlcCloseConverter(conv);
     _XlcDestroyLC(lcd);
 
-    *gi = (_XUDCGIInf *)Xmalloc(sizeof(_XUDCGIInf));
-    (*gi)->charset_str = (char *)Xmalloc(strlen(charsetname)+1);
-    strcpy((*gi)->charset_str,charsetname);
-    (*gi)->glyph_index = glyph;
+    *gi = Xmalloc(sizeof(_XUDCGIInf));
     if(*gi == NULL){
 	_xudc_utyerrno = 0x03 ;
         return(_XUDC_ERROR);
     }
+    (*gi)->charset_str = Xmalloc(strlen(charsetname)+1);
+    strcpy((*gi)->charset_str,charsetname);
+    (*gi)->glyph_index = glyph;
     *num_gi = 1;
     return(0);
 }