diff options
| author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-09-18 15:12:54 +0000 |
|---|---|---|
| committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-09-18 15:12:54 +0000 |
| commit | 386a49d30bc63ed6500fcf5ab3d22552ca1c5fdf (patch) | |
| tree | 805859bce565c50faa8ed31298bf2032b4f50ee1 | |
| parent | 0fde1939fcafd16753f3a63f06487a761311e358 (diff) | |
| download | emacs-386a49d30bc63ed6500fcf5ab3d22552ca1c5fdf.tar.gz emacs-386a49d30bc63ed6500fcf5ab3d22552ca1c5fdf.tar.bz2 emacs-386a49d30bc63ed6500fcf5ab3d22552ca1c5fdf.zip | |
(x_get_string_resource): Ape just-previous changes to other platform versions. Drop support for emacs-20-style face specs.
| -rw-r--r-- | src/nsfns.m | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/nsfns.m b/src/nsfns.m index 136ae0310c1..f760aa63957 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -2139,15 +2139,12 @@ x_get_string_resource (XrmDatabase rdb, char *name, char *class) 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); + if (inhibit_x_resources) + /* --quick was passed, so this is a no-op. */ + return NULL; -/*fprintf (stderr, "Checking '%s'\n", toCheck); */ - - res = ns_no_defaults ? NULL : - [[[NSUserDefaults standardUserDefaults] objectForKey: - [NSString stringWithUTF8String: toCheck]] UTF8String]; + res = [[[NSUserDefaults standardUserDefaults] objectForKey: + [NSString stringWithUTF8String: toCheck]] UTF8String]; return !res ? NULL : (!strncasecmp (res, "YES", 3) ? "true" : (!strncasecmp (res, "NO", 2) ? "false" : res)); |