[Emacs-diffs] /srv/bzr/emacs/trunk r99296: * nsterm.m (syms_of_nsterm): Initialize Qcontrol etc. before

[Chong Yidong]

------------------------------------------------------------
revno: 99296
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2010-01-11 09:54:52 -0500
message:
  * nsterm.m (syms_of_nsterm): Initialize Qcontrol etc. before
  initializing the Lisp variables that depend on them.
modified:
  src/ChangeLog
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-01-11 05:19:47 +0000
+++ b/src/ChangeLog     2010-01-11 14:54:52 +0000
@@ -1,3 +1,8 @@
+2010-01-11  Chong Yidong  <address@hidden>
+
+       * nsterm.m (syms_of_nsterm): Initialize Qcontrol etc. before
+       initializing the Lisp variables that depend on them.
+
 2010-01-11  YAMAMOTO Mitsuharu  <address@hidden>
 
        * xfns.c (x_set_menu_bar_lines) [!USE_X_TOOLKIT && !USE_GTK]:

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2010-01-09 20:31:26 +0000
+++ b/src/nsterm.m      2010-01-11 14:54:52 +0000
@@ -6144,6 +6144,19 @@
 
   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 @@
   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.  */);