Index: lib/X11/ErrDes.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/ErrDes.c,v
retrieving revision 1.2
diff -u -r1.2 ErrDes.c
--- lib/X11/ErrDes.c	23 Apr 2004 18:43:23 -0000	1.2
+++ lib/X11/ErrDes.c	1 Dec 2004 12:59:12 -0000
@@ -146,9 +146,13 @@
 	   mutex unlocked. */
 	XrmDatabase temp_db;
 	int do_destroy;
+    const char *dbname;
 
 	XrmInitialize();
-	temp_db = XrmGetFileDatabase(ERRORDB);
+	dbname = getenv("XERRORDB");
+	if (!dbname)
+	    dbname = ERRORDB;
+	temp_db = XrmGetFileDatabase(dbname);
 
 	_XLockMutex(_Xglobal_lock);
 	if (!db) {