diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-01-14 20:46:53 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-01-14 20:46:53 -0500 |
| commit | 7ffdf101fbb95fce1acba91af39c9df1f3c2a053 (patch) | |
| tree | f423f1196934e71fc3d7da40cd8657e3840e47b2 | |
| parent | becbbaa7132dde5d693f41d6e55511024a258af5 (diff) | |
| download | emacs-7ffdf101fbb95fce1acba91af39c9df1f3c2a053.tar.gz | |
Fix Qnone definition in NS files.
* nsterm.m (Qnone): Define here.
* nsfns.m (Qnone): Move definition to nsterm.m.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/nsfns.m | 4 | ||||
| -rw-r--r-- | src/nsterm.m | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e18591b345b..f5e2393724c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 --git a/src/nsfns.m b/src/nsfns.m index 9fdcaa47c8c..357222bb18a 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -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); diff --git a/src/nsterm.m b/src/nsterm.m index 69cece47b0e..a102267920c 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -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)); |