# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1253286774 0
# Node ID 767bf46c924dcf17652663686187e0948efa51e0
# Parent  ed989664c4440696b19c0677a27e82517d33f561
(x_get_string_resource): Ape just-previous changes to other platform versions.  Drop support for emacs-20-style face specs.

diff -r ed989664c444 -r 767bf46c924d src/nsfns.m
--- a/src/nsfns.m	Fri Sep 18 15:12:34 2009 +0000
+++ b/src/nsfns.m	Fri Sep 18 15:12:54 2009 +0000
@@ -2139,15 +2139,12 @@
   const char *res;
   check_ns ();
 
-  /* Support emacs-20-style face resources for backwards compatibility */
-  if (!strncmp (toCheck, "Face", 4))
-    toCheck = name + (!strncmp (name, "emacs.", 6) ? 6 : 0);
-
-/*fprintf (stderr, "Checking '%s'\n", toCheck); */
-
-  res = ns_no_defaults ? NULL :
-    [[[NSUserDefaults standardUserDefaults] objectForKey:
-                     [NSString stringWithUTF8String: toCheck]] UTF8String];
+  if (inhibit_x_resources)
+    /* --quick was passed, so this is a no-op.  */
+    return NULL;
+
+  res = [[[NSUserDefaults standardUserDefaults] objectForKey:
+            [NSString stringWithUTF8String: toCheck]] UTF8String];
   return !res ? NULL :
       (!strncasecmp (res, "YES", 3) ? "true" :
           (!strncasecmp (res, "NO", 2) ? "false" : res));