[Emacs-diffs] /srv/bzr/emacs/trunk r99331: Fix Qnone definition in NS files.

[Chong Yidong]

------------------------------------------------------------
revno: 99331
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2010-01-14 20:46:53 -0500
message:
  Fix Qnone definition in NS files.
  
  * nsterm.m (Qnone): Define here.
  * nsfns.m (Qnone): Move definition to nsterm.m.
modified:
  src/ChangeLog
  src/nsfns.m
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-01-14 11:31:16 +0000
+++ b/src/ChangeLog     2010-01-15 01:46:53 +0000
@@ -1,3 +1,9 @@
+2010-01-15  Chong Yidong  <address@hidden>
+
+       * nsterm.m (Qnone): Define.
+
+       * nsfns.m (Qnone): Move definition to nsterm.m.
+
 2010-01-14  Kenichi Handa  <address@hidden>
 
        * coding.c (detect_coding_iso_2022): Fix handling of euc-xx coding

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2010-01-13 08:35:10 +0000
+++ b/src/nsfns.m       2010-01-15 01:46:53 +0000
@@ -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;
+extern Lisp_Object Qnone;
 
-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);
 

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2010-01-13 08:35:10 +0000
+++ b/src/nsterm.m      2010-01-15 01:46:53 +0000
@@ -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));