mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-10 05:30:45 -08:00
Code Issues Projects Releases Wiki Activity

Fix Qnone definition in NS files.

Browse source 
* nsterm.m (Qnone): Define here.
* nsfns.m (Qnone): Move definition to nsterm.m.
This commit is contained in:
Chong Yidong 2010-01-14 20:46:53 -05:00
parent becbbaa713
commit 7ffdf101fb
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -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

4
src/nsfns.m
View file

@ -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);

4
src/nsterm.m
View file

@ -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));