Commit 7ffdf101 authored by Chong Yidong's avatar Chong Yidong

Fix Qnone definition in NS files.

* nsterm.m (Qnone): Define here.
* nsfns.m (Qnone): Move definition to nsterm.m.
parent becbbaa7
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
......
......@@ -80,8 +80,8 @@ Updated by Christian Limpach (chris@nice.ch)
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 @@ - (NSString *)panel: (id)sender userEnteredFilename: (NSString *)filename
{
int i;
Qnone = intern ("none");
staticpro (&Qnone);
Qfontsize = intern ("fontsize");
staticpro (&Qfontsize);
......
......@@ -141,8 +141,7 @@ Updated by Christian Limpach (chris@nice.ch)
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 @@ Convert an X font name (XLFD) to an NS font name.
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));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment