diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsterm.m | 26 |
2 files changed, 18 insertions, 13 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cac262b3b2f..4342d39052d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-01-11 Chong Yidong <cyd@stupidchicken.com> + + * nsterm.m (syms_of_nsterm): Initialize Qcontrol etc. before + initializing the Lisp variables that depend on them. + 2010-01-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * xfns.c (x_set_menu_bar_lines) [!USE_X_TOOLKIT && !USE_GTK]: diff --git a/src/nsterm.m b/src/nsterm.m index 18c51d00938..4f6c1d8d924 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -6144,6 +6144,19 @@ syms_of_nsterm () ns_antialias_threshold = 10.0; + /* from 23+ we need to tell emacs what modifiers there are.. */ + Qmodifier_value = intern ("modifier-value"); + Qalt = intern ("alt"); + Fput (Qalt, Qmodifier_value, make_number (alt_modifier)); + Qhyper = intern ("hyper"); + Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier)); + Qmeta = intern ("meta"); + Fput (Qmeta, Qmodifier_value, make_number (meta_modifier)); + Qsuper = intern ("super"); + Fput (Qsuper, Qmodifier_value, make_number (super_modifier)); + Qcontrol = intern ("control"); + Fput (Qcontrol, Qmodifier_value, make_number (ctrl_modifier)); + DEFVAR_LISP ("ns-input-file", &ns_input_file, "The file specified in the last NS event."); ns_input_file =Qnil; @@ -6218,19 +6231,6 @@ allowing it to be used at a lower level for accented character entry."); staticpro (&last_mouse_motion_frame); last_mouse_motion_frame = Qnil; - /* from 23+ we need to tell emacs what modifiers there are.. */ - Qmodifier_value = intern ("modifier-value"); - Qalt = intern ("alt"); - Fput (Qalt, Qmodifier_value, make_number (alt_modifier)); - Qhyper = intern ("hyper"); - Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier)); - Qmeta = intern ("meta"); - Fput (Qmeta, Qmodifier_value, make_number (meta_modifier)); - Qsuper = intern ("super"); - Fput (Qsuper, Qmodifier_value, make_number (super_modifier)); - Qcontrol = intern ("control"); - Fput (Qcontrol, Qmodifier_value, make_number (ctrl_modifier)); - /* TODO: move to common code */ DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars, doc: /* If not nil, Emacs uses toolkit scroll bars. */); |