diff options
| author | Adrian Robert | 2009-09-18 15:12:54 +0000 |
|---|---|---|
| committer | Adrian Robert | 2009-09-18 15:12:54 +0000 |
| commit | 386a49d30bc63ed6500fcf5ab3d22552ca1c5fdf (patch) | |
| tree | 805859bce565c50faa8ed31298bf2032b4f50ee1 /src | |
| parent | 0fde1939fcafd16753f3a63f06487a761311e358 (diff) | |
| download | emacs-386a49d30bc63ed6500fcf5ab3d22552ca1c5fdf.tar.gz emacs-386a49d30bc63ed6500fcf5ab3d22552ca1c5fdf.zip | |
(x_get_string_resource): Ape just-previous changes to other platform versions. Drop support for emacs-20-style face specs.
Diffstat (limited to 'src')
| -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) | |||
| 2139 | const char *res; | 2139 | const char *res; |
| 2140 | check_ns (); | 2140 | check_ns (); |
| 2141 | 2141 | ||
| 2142 | /* Support emacs-20-style face resources for backwards compatibility */ | 2142 | if (inhibit_x_resources) |
| 2143 | if (!strncmp (toCheck, "Face", 4)) | 2143 | /* --quick was passed, so this is a no-op. */ |
| 2144 | toCheck = name + (!strncmp (name, "emacs.", 6) ? 6 : 0); | 2144 | return NULL; |
| 2145 | 2145 | ||
| 2146 | /*fprintf (stderr, "Checking '%s'\n", toCheck); */ | 2146 | res = [[[NSUserDefaults standardUserDefaults] objectForKey: |
| 2147 | 2147 | [NSString stringWithUTF8String: toCheck]] UTF8String]; | |
| 2148 | res = ns_no_defaults ? NULL : | ||
| 2149 | [[[NSUserDefaults standardUserDefaults] objectForKey: | ||
| 2150 | [NSString stringWithUTF8String: toCheck]] UTF8String]; | ||
| 2151 | return !res ? NULL : | 2148 | return !res ? NULL : |
| 2152 | (!strncasecmp (res, "YES", 3) ? "true" : | 2149 | (!strncasecmp (res, "YES", 3) ? "true" : |
| 2153 | (!strncasecmp (res, "NO", 2) ? "false" : res)); | 2150 | (!strncasecmp (res, "NO", 2) ? "false" : res)); |