diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2011-01-19 23:11:33 +0100 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2011-01-19 23:11:33 +0100 |
| commit | fb9d0f5afc688e0225c173fa85fd0123467be59c (patch) | |
| tree | cbb26f50e3d5690c2a8178c62c899a5db4fb3932 /src/nsfns.m | |
| parent | 817a735de075cfdb0196eeee8c90435a7cacf13a (diff) | |
| download | emacs-fb9d0f5afc688e0225c173fa85fd0123467be59c.tar.gz emacs-fb9d0f5afc688e0225c173fa85fd0123467be59c.tar.bz2 emacs-fb9d0f5afc688e0225c173fa85fd0123467be59c.zip | |
Fix NextStep build problems with globals.h introducion.
* src/globals.h (struct emacs_globals): Add f_ns_input_file,
f_ns_input_font, f_ns_input_fontsize, f_ns_input_line,
f_ns_input_color, f_ns_input_text, f_ns_working_text,
f_ns_input_spi_name, f_ns_input_spi_arg, f_ns_alternate_modifier,
f_ns_right_alternate_modifier, f_ns_command_modifier,
f_ns_right_command_modifier, f_ns_control_modifier,
f_ns_right_control_modifier, f_ns_function_modifier,
f_ns_antialias_text, f_ns_confirm_quit, f_Vns_icon_type_alist,
f_Vns_version_string, f_Vns_sent_selection_hooks,
f_Vns_lost_selection_hooks, f_Vselection_alist, f_Vns_reg_to_script
and corresponding defines.
* src/nsfns.m (Vmenu_bar_mode, Vtool_bar_mode): Remove declaration.
(Vns_icon_type_alist, Vns_version_string): Move to globals.h.
(syms_of_nsfns): Remove & from DEFVAR_LISP calls.
* src/nsfont.m (Vns_reg_to_script, ns_antialias_text): Move to
globals.h.
(syms_of_nsfont): Remove & from DEFVAR_LISP.
* src/nsselect.m (Vns_sent_selection_hooks, Vns_lost_selection_hooks
(Vselection_alist, Vselection_converter_alist): Move to globals.h.
(syms_of_nsselect): Remove & from DEFVAR_LISP.
* src/nsterm.m (ns_input_file, ns_input_font, ns_input_fontsize)
(ns_input_line, ns_input_color, ns_input_text, ns_working_text)
(ns_input_spi_name, ns_input_spi_arg)
(ns_alternate_modifier, ns_right_alternate_modifier)
(ns_command_modifier, ns_right_command_modifier, ns_control_modifier)
(ns_right_control_modifier, ns_function_modifier)
(ns_antialias_text, ns_confirm_quit): Move to globals.h.
(Vx_toolkit_scroll_bars, x_use_underline_position_properties)
(x_underline_at_descent_line): Remove declaration.
(syms_of_nsterm): Remove & from DEFVAR_LISP and DEFVAR_BOOL.
* src/nsmenu.m (Voverriding_local_map, Voverriding_local_map_menu_flag):
Remove declaration.
Diffstat (limited to 'src/nsfns.m')
| -rw-r--r-- | src/nsfns.m | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/nsfns.m b/src/nsfns.m index b98f8bc815f..b9042c1de60 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -82,11 +82,7 @@ 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; -extern Lisp_Object Vframe_title_format, Vicon_title_format; -/* The below are defined in frame.c. */ - -extern Lisp_Object Vmenu_bar_mode, Vtool_bar_mode; Lisp_Object Qbuffered; Lisp_Object Qfontsize; @@ -94,13 +90,6 @@ Lisp_Object Qfontsize; /* hack for OS X file panels */ char panelOK = 0; -/* Alist of elements (REGEXP . IMAGE) for images of icons associated - to frames.*/ -static Lisp_Object Vns_icon_type_alist; - -/* Toolkit version support. */ -static Lisp_Object Vns_version_string; - EmacsTooltip *ns_tooltip; /* Need forward declaration here to preserve organizational integrity of file */ @@ -2593,7 +2582,7 @@ syms_of_nsfns (void) Qfontsize = intern_c_string ("fontsize"); staticpro (&Qfontsize); - DEFVAR_LISP ("ns-icon-type-alist", &Vns_icon_type_alist, + DEFVAR_LISP ("ns-icon-type-alist", Vns_icon_type_alist, doc: /* Alist of elements (REGEXP . IMAGE) for images of icons associated to frames. If the title of a frame matches REGEXP, then IMAGE.tiff is selected as the image of the icon representing the frame when it's @@ -2614,7 +2603,7 @@ When you miniaturize a Group, Summary or Article frame, Gnus.tiff will be used as the image of the icon representing the frame. */); Vns_icon_type_alist = Fcons (Qt, Qnil); - DEFVAR_LISP ("ns-version-string", &Vns_version_string, + DEFVAR_LISP ("ns-version-string", Vns_version_string, doc: /* Toolkit version for NS Windowing. */); Vns_version_string = ns_appkit_version_str (); |