Mercurial > emacs

comparison src/nsterm.m @ 106843:36dd02b00382

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix Qnone definition in NS files. * nsterm.m (Qnone): Define here. * nsfns.m (Qnone): Move definition to nsterm.m.
author Chong Yidong <cyd@stupidchicken.com>
date Thu, 14 Jan 2010 20:46:53 -0500
parents 1d1d5d9bd884
children f151a3ed653f
comparison
equal deleted inserted replaced
106842:ca0315d80583 106843:36dd02b00382
139 Lisp_Object ns_input_file, ns_input_font, ns_input_fontsize, ns_input_line; 139 Lisp_Object ns_input_file, ns_input_font, ns_input_fontsize, ns_input_line;
140 Lisp_Object ns_input_color, ns_input_text, ns_working_text; 140 Lisp_Object ns_input_color, ns_input_text, ns_working_text;
141 Lisp_Object ns_input_spi_name, ns_input_spi_arg; 141 Lisp_Object ns_input_spi_name, ns_input_spi_arg;
142 Lisp_Object Vx_toolkit_scroll_bars; 142 Lisp_Object Vx_toolkit_scroll_bars;
143 static Lisp_Object Qmodifier_value; 143 static Lisp_Object Qmodifier_value;
144 /* TODO: unsure why these defined in term files, anyway we need in keymap.c */ 144 Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper, Qnone;
145 Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper;
146 extern Lisp_Object Qcursor_color, Qcursor_type, Qns; 145 extern Lisp_Object Qcursor_color, Qcursor_type, Qns;
147 146
148 /* Specifies which emacs modifier should be generated when NS receives 147 /* Specifies which emacs modifier should be generated when NS receives
149 the Alternate modifer. May be Qnone or any of the modifier lisp symbols. */ 148 the Alternate modifer. May be Qnone or any of the modifier lisp symbols. */
150 Lisp_Object ns_alternate_modifier; 149 Lisp_Object ns_alternate_modifier;
6149 DEFSYM (Qalt, "alt"); 6148 DEFSYM (Qalt, "alt");
6150 DEFSYM (Qhyper, "hyper"); 6149 DEFSYM (Qhyper, "hyper");
6151 DEFSYM (Qmeta, "meta"); 6150 DEFSYM (Qmeta, "meta");
6152 DEFSYM (Qsuper, "super"); 6151 DEFSYM (Qsuper, "super");
6153 DEFSYM (Qcontrol, "control"); 6152 DEFSYM (Qcontrol, "control");
6153 DEFSYM (Qnone, "none");
6154 Fput (Qalt, Qmodifier_value, make_number (alt_modifier)); 6154 Fput (Qalt, Qmodifier_value, make_number (alt_modifier));
6155 Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier)); 6155 Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier));
6156 Fput (Qmeta, Qmodifier_value, make_number (meta_modifier)); 6156 Fput (Qmeta, Qmodifier_value, make_number (meta_modifier));
6157 Fput (Qsuper, Qmodifier_value, make_number (super_modifier)); 6157 Fput (Qsuper, Qmodifier_value, make_number (super_modifier));
6158 Fput (Qcontrol, Qmodifier_value, make_number (ctrl_modifier)); 6158 Fput (Qcontrol, Qmodifier_value, make_number (ctrl_modifier));