# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1263520013 18000
# Node ID 36dd02b0038288642d55877117f3c673b2b338c2
# Parent  ca0315d80583a72c944d1debe67d934c08c79313
Fix Qnone definition in NS files.

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

diff -r ca0315d80583 -r 36dd02b00382 src/ChangeLog
--- a/src/ChangeLog	Fri Jan 15 11:26:27 2010 +1300
+++ b/src/ChangeLog	Thu Jan 14 20:46:53 2010 -0500
@@ -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 -r ca0315d80583 -r 36dd02b00382 src/nsfns.m
--- a/src/nsfns.m	Fri Jan 15 11:26:27 2010 +1300
+++ b/src/nsfns.m	Thu Jan 14 20:46:53 2010 -0500
@@ -80,8 +80,8 @@
 extern Lisp_Object Qunderline, Qundefined;
 extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth;
 extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle;
-
-Lisp_Object Qnone;
+extern Lisp_Object Qnone;
+
 Lisp_Object Qbuffered;
 Lisp_Object Qfontsize;
 
@@ -2606,8 +2606,6 @@
 {
   int i;
 
-  Qnone = intern ("none");
-  staticpro (&Qnone);
   Qfontsize = intern ("fontsize");
   staticpro (&Qfontsize);
 
diff -r ca0315d80583 -r 36dd02b00382 src/nsterm.m
--- a/src/nsterm.m	Fri Jan 15 11:26:27 2010 +1300
+++ b/src/nsterm.m	Thu Jan 14 20:46:53 2010 -0500
@@ -141,8 +141,7 @@
 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 @@
   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));