X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9850eff524bd0747a9561f3b4c90dfc3749f4ecb..b78f97676f9c1e47c127275ae542f344f300310d:/src/w32reg.c
diff --git a/src/w32reg.c b/src/w32reg.c
index 56e3b42917..f9687d1eff 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -1,6 +1,6 @@
/* Emulate the X Resource Manager through the registry.
Copyright (C) 1990, 1993, 1994, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -20,6 +20,7 @@ along with GNU Emacs. If not, see . */
/* Written by Kevin Gallo */
#include
+#include
#include "lisp.h"
#include "w32term.h"
#include "blockinput.h"
@@ -76,7 +77,7 @@ w32_get_rdb_resource (rdb, resource)
return NULL;
}
-LPBYTE
+static LPBYTE
w32_get_string_resource (name, class, dwexptype)
char *name, *class;
DWORD dwexptype;
@@ -160,6 +161,10 @@ x_get_string_resource (rdb, name, class)
return resource;
}
+ if (inhibit_x_resources)
+ /* --quick was passed, so this is a no-op. */
+ return NULL;
+
return (w32_get_string_resource (name, class, REG_SZ));
}