Mercurial > emacs
changeset 105085:767bf46c924d
(x_get_string_resource): Ape just-previous changes to other platform versions. Drop support for emacs-20-style face specs.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Fri, 18 Sep 2009 15:12:54 +0000 |
| parents | ed989664c444 |
| children | 8fe68cf74ed4 |
| files | src/nsfns.m |
| diffstat | 1 files changed, 6 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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));