Commit e5a29a10 authored by Chong Yidong's avatar Chong Yidong

Fix for Bug#4113.

* nsterm.m (ns_set_default_prefs): Delete function.
(syms_of_nsterm): Initialize ns_command_modifier,
ns_control_modifier, ns_function_modifier, ns_antialias_text, and
ns_antialias_threshold here, not in ns_term_init (Bug#4113).
parent 2f1c6384
2010-01-09 Chong Yidong <cyd@stupidchicken.com>
* nsterm.m (ns_set_default_prefs): Delete function.
(syms_of_nsterm): Initialize ns_command_modifier,
ns_control_modifier, ns_function_modifier, ns_antialias_text, and
ns_antialias_threshold here, not in ns_term_init (Bug#4113).
* xdisp.c (pos_visible_p): Check for invisible text at the correct
position (Bug#4040).
......
......@@ -3478,22 +3478,6 @@ Convert modifier code (see lisp.h) to lisp symbol
}
static void
ns_set_default_prefs ()
/* --------------------------------------------------------------------------
Initialize preference variables to defaults
-------------------------------------------------------------------------- */
{
ns_alternate_modifier = Qmeta;
ns_command_modifier = Qsuper;
ns_control_modifier = Qcontrol;
ns_function_modifier = Qnone;
ns_antialias_text = Qt;
ns_antialias_threshold = 10.0; /* not exposed to lisp side */
ns_confirm_quit = Qnil;
}
static void
ns_default (const char *parameter, Lisp_Object *result,
Lisp_Object yesval, Lisp_Object noval,
......@@ -3756,8 +3740,6 @@ Needs to be here because ns_initialize_display_info () uses AppKit classes.
UNBLOCK_INPUT;
/* Read various user defaults. */
ns_set_default_prefs ();
if (!inhibit_x_resources)
{
ns_default ("GSFontAntiAlias", &ns_antialias_text,
......@@ -6159,6 +6141,9 @@ Convert an X font name (XLFD) to an NS font name.
syms_of_nsterm ()
{
NSTRACE (syms_of_nsterm);
ns_antialias_threshold = 10.0;
DEFVAR_LISP ("ns-input-file", &ns_input_file,
"The file specified in the last NS event.");
ns_input_file =Qnil;
......@@ -6200,26 +6185,32 @@ Convert an X font name (XLFD) to an NS font name.
Set to control, meta, alt, super, or hyper means it is taken to be that key.\n\
Set to none means that the alternate / option key is not interpreted by Emacs\n\
at all, allowing it to be used at a lower level for accented character entry.");
ns_alternate_modifier = Qmeta;
DEFVAR_LISP ("ns-command-modifier", &ns_command_modifier,
"This variable describes the behavior of the command key.\n\
Set to control, meta, alt, super, or hyper means it is taken to be that key.");
ns_command_modifier = Qsuper;
DEFVAR_LISP ("ns-control-modifier", &ns_control_modifier,
"This variable describes the behavior of the control key.\n\
Set to control, meta, alt, super, or hyper means it is taken to be that key.");
ns_control_modifier = Qcontrol;
DEFVAR_LISP ("ns-function-modifier", &ns_function_modifier,
"This variable describes the behavior of the function key (on laptops).\n\
Set to control, meta, alt, super, or hyper means it is taken to be that key.\n\
Set to none means that the function key is not interpreted by Emacs at all,\n\
allowing it to be used at a lower level for accented character entry.");
ns_function_modifier = Qnone;
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.");
ns_antialias_text = Qt;
DEFVAR_LISP ("ns-confirm-quit", &ns_confirm_quit,
"Whether to confirm application quit using dialog.");
ns_confirm_quit = Qnil;
staticpro (&ns_display_name_list);
ns_display_name_list = Qnil;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment