[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src nsterm.m
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] emacs/src nsterm.m |
Date: |
Fri, 18 Sep 2009 15:12:15 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 09/09/18 15:12:15
Modified files:
src : nsterm.m
Log message:
(ns_no_defaults): Remove. (ns_term_init): Switch ns_no_defaults ->
inhibit_x_resources. (ns_use_qd_smoothing): Remove legacy variable.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.m?cvsroot=emacs&r1=1.85&r2=1.86
Patches:
Index: nsterm.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.m,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- nsterm.m 3 Sep 2009 06:03:48 -0000 1.85
+++ nsterm.m 18 Sep 2009 15:12:15 -0000 1.86
@@ -144,15 +144,6 @@
Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper;
extern Lisp_Object Qcursor_color, Qcursor_type, Qns;
-
-/* Some preferences equivalent to those set by X resources under X are
- managed through the OpenStep defaults system. We depart from X
- behavior and refuse to read defaults when started under these
- options. */
-
-/* Set in emacs.c. */
-char ns_no_defaults;
-
/* Specifies which emacs modifier should be generated when NS receives
the Alternate modifer. May be Qnone or any of the modifier lisp symbols. */
Lisp_Object ns_alternate_modifier;
@@ -177,10 +168,6 @@
no way to control this behavior. */
float ns_antialias_threshold;
-/* Controls use of an undocumented CG function to do Quickdraw-style font
- smoothing (less heavy) instead of regular Quartz smoothing. */
-Lisp_Object ns_use_qd_smoothing;
-
/* Used to pick up AppleHighlightColor on OS X */
NSString *ns_selection_color;
@@ -3520,7 +3507,6 @@
ns_function_modifier = Qnone;
ns_antialias_text = Qt;
ns_antialias_threshold = 10.0; /* not exposed to lisp side */
- ns_use_qd_smoothing = Qnil;
ns_confirm_quit = Qnil;
}
@@ -3789,7 +3775,7 @@
/* Read various user defaults. */
ns_set_default_prefs ();
- if (!ns_no_defaults)
+ if (!inhibit_x_resources)
{
ns_default ("GSFontAntiAlias", &ns_antialias_text,
Qt, Qnil, NO, NO);
@@ -5021,10 +5007,9 @@
}
#endif /* NS_IMPL_COCOA */
- // Calling x_set_window_size tends to get us into inf-loops
- // (x_set_window_size causes a resize which causes
- // a "windowDidResize" which calls x_set_window_size).
- // At least with GNUStep, don't know about MacOSX. --Stef
+ /* Avoid loop under GNUstep due to call at beginning of this function.
+ (x_set_window_size causes a resize which causes
+ a "windowDidResize" which calls x_set_window_size). */
#ifndef NS_IMPL_GNUSTEP
if (cols > 0 && rows > 0)
x_set_window_size (emacsframe, 0, cols, rows);
@@ -5247,7 +5232,7 @@
result.origin.y = defaultFrame.origin.y;
}
- /* A windowWillResize does not get generated at least on Tiger. */
+ /* A windowWillResize does not get generated on Tiger or Leopard. */
[self windowWillResize: sender toSize: result.size];
return result;
}
@@ -6236,9 +6221,6 @@
DEFVAR_LISP ("ns-antialias-text", &ns_antialias_text,
"Non-nil (the default) means to render text antialiased. Only
has an effect on OS X Panther and above.");
- DEFVAR_LISP ("ns-use-qd-smoothing", &ns_use_qd_smoothing,
- "Whether to render text using QuickDraw (less heavy)
antialiasing. Only has an effect on OS X Panther and above. Default is nil
(use Quartz smoothing).");
-
DEFVAR_LISP ("ns-confirm-quit", &ns_confirm_quit,
"Whether to confirm application quit using dialog.");