mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 04:30:45 -08:00
Code Issues Projects Releases Wiki Activity

(x_get_string_resource): Ape just-previous changes to other platform versions. Drop support for emacs-20-style face specs.

Browse source
This commit is contained in:
Adrian Robert 2009-09-18 15:12:54 +00:00
parent 0fde1939fc
commit 386a49d30b
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/nsfns.m
View file

@ -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));