* syntax.c (Fchar_syntax): Minor doc fix (Bug#119).

[gnu-emacs] / src / xrdb.c

diff --git a/src/xrdb.c b/src/xrdb.c
index 961f2748b5846ecacb63190ae51cd6e7078ea124..fac97e4350f6af228967b995d1681ea114daeadc 100644 (file)
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -1,6 +1,9 @@
 /* Deal with the X Resource Manager.
    Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+Author: Joseph Arceneaux
+Created: 4/90
 
 This file is part of GNU Emacs.
 
@@ -17,8 +20,6 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Written by jla, 4/90 */
-
 #ifdef emacs
 #include <config.h>
 #endif
@@ -692,6 +693,10 @@ x_get_string_resource (rdb, name, class)
 {
   XrmValue value;
 
+  if (inhibit_x_resources)
+    /* --quick was passed, so this is a no-op.  */
+    return NULL;
+
   if (x_get_resource (rdb, name, class, x_rm_string, &value))
     return (char *) value.addr;