[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src nsfns.m
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] emacs/src nsfns.m |
Date: |
Fri, 18 Sep 2009 15:12:54 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 09/09/18 15:12:54
Modified files:
src : nsfns.m
Log message:
(x_get_string_resource): Ape just-previous changes to other platform
versions. Drop support for emacs-20-style face specs.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsfns.m?cvsroot=emacs&r1=1.48&r2=1.49
Patches:
Index: nsfns.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfns.m,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- nsfns.m 20 Aug 2009 09:44:06 -0000 1.48
+++ nsfns.m 18 Sep 2009 15:12:54 -0000 1.49
@@ -2139,14 +2139,11 @@
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:
+ res = [[[NSUserDefaults standardUserDefaults] objectForKey:
[NSString stringWithUTF8String: toCheck]] UTF8String];
return !res ? NULL :
(!strncasecmp (res, "YES", 3) ? "true" :
- [Emacs-diffs] emacs/src nsfns.m,
Adrian Robert <=