Fix Qnone definition in NS files.

* nsterm.m (Qnone): Define here.
* nsfns.m (Qnone): Move definition to nsterm.m.

diff --git a/src/ChangeLog b/src/ChangeLog
index e18591b345b4ba2ef6b27742db765425470d6b16..f5e2393724c7cb27f7bb0d0095b4f1196f3f08b7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-15  Chong Yidong  <cyd@stupidchicken.com>
+
+       * nsterm.m (Qnone): Define.
+
+       * nsfns.m (Qnone): Move definition to nsterm.m.
+
 2010-01-14  Kenichi Handa  <handa@m17n.org>
 
        * coding.c (detect_coding_iso_2022): Fix handling of euc-xx coding

diff --git a/src/nsfns.m b/src/nsfns.m
index 9fdcaa47c8cd7def84f6399f310cceb223c3b435..357222bb18af68159a89c5b838e3bf00da88089c 100644 (file)
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -80,8 +80,8 @@ extern Lisp_Object Qface_set_after_frame_default;
 extern Lisp_Object Qunderline, Qundefined;
 extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth;
 extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle;
+extern Lisp_Object Qnone;
 
-Lisp_Object Qnone;
 Lisp_Object Qbuffered;
 Lisp_Object Qfontsize;
 
@@ -2606,8 +2606,6 @@ syms_of_nsfns ()
 {
   int i;
 
-  Qnone = intern ("none");
-  staticpro (&Qnone);
   Qfontsize = intern ("fontsize");
   staticpro (&Qfontsize);
 

diff --git a/src/nsterm.m b/src/nsterm.m
index 69cece47b0e94bafa1b685f3834d4e8b7e3023b0..a102267920c382bb79b3dfacf7eee933004f8ce2 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -141,8 +141,7 @@ Lisp_Object ns_input_color, ns_input_text, ns_working_text;
 Lisp_Object ns_input_spi_name, ns_input_spi_arg;
 Lisp_Object Vx_toolkit_scroll_bars;
 static Lisp_Object Qmodifier_value;
-/* TODO: unsure why these defined in term files, anyway we need in keymap.c */
-Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper;
+Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper, Qnone;
 extern Lisp_Object Qcursor_color, Qcursor_type, Qns;
 
 /* Specifies which emacs modifier should be generated when NS receives
@@ -6151,6 +6150,7 @@ syms_of_nsterm ()
   DEFSYM (Qmeta, "meta");
   DEFSYM (Qsuper, "super");
   DEFSYM (Qcontrol, "control");
+  DEFSYM (Qnone, "none");
   Fput (Qalt, Qmodifier_value, make_number (alt_modifier));
   Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier));
   Fput (Qmeta, Qmodifier_value, make_number (meta_modifier));