Mercurial > emacs
comparison src/nsselect.m @ 112370:7935463f385e
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.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Wed, 19 Jan 2011 23:11:33 +0100 |
parents | ef719132ddfa |
children |
comparison
equal
deleted
inserted
replaced
112368:4cddf15c8d9a | 112370:7935463f385e |
---|---|
36 #include "keyboard.h" | 36 #include "keyboard.h" |
37 | 37 |
38 #define CUT_BUFFER_SUPPORT | 38 #define CUT_BUFFER_SUPPORT |
39 | 39 |
40 Lisp_Object QCLIPBOARD, QSECONDARY, QTEXT, QFILE_NAME; | 40 Lisp_Object QCLIPBOARD, QSECONDARY, QTEXT, QFILE_NAME; |
41 | |
42 static Lisp_Object Vns_sent_selection_hooks; | |
43 static Lisp_Object Vns_lost_selection_hooks; | |
44 static Lisp_Object Vselection_alist; | |
45 static Lisp_Object Vselection_converter_alist; | |
46 | 41 |
47 static Lisp_Object Qforeign_selection; | 42 static Lisp_Object Qforeign_selection; |
48 | 43 |
49 /* NSGeneralPboard is pretty much analogous to X11 CLIPBOARD */ | 44 /* NSGeneralPboard is pretty much analogous to X11 CLIPBOARD */ |
50 NSString *NXPrimaryPboard; | 45 NSString *NXPrimaryPboard; |
566 #endif | 561 #endif |
567 | 562 |
568 Vselection_alist = Qnil; | 563 Vselection_alist = Qnil; |
569 staticpro (&Vselection_alist); | 564 staticpro (&Vselection_alist); |
570 | 565 |
571 DEFVAR_LISP ("ns-sent-selection-hooks", &Vns_sent_selection_hooks, | 566 DEFVAR_LISP ("ns-sent-selection-hooks", Vns_sent_selection_hooks, |
572 "A list of functions to be called when Emacs answers a selection request.\n\ | 567 "A list of functions to be called when Emacs answers a selection request.\n\ |
573 The functions are called with four arguments:\n\ | 568 The functions are called with four arguments:\n\ |
574 - the selection name (typically `PRIMARY', `SECONDARY', or `CLIPBOARD');\n\ | 569 - the selection name (typically `PRIMARY', `SECONDARY', or `CLIPBOARD');\n\ |
575 - the selection-type which Emacs was asked to convert the\n\ | 570 - the selection-type which Emacs was asked to convert the\n\ |
576 selection into before sending (for example, `STRING' or `LENGTH');\n\ | 571 selection into before sending (for example, `STRING' or `LENGTH');\n\ |
580 to convert into a type that we don't know about or that is inappropriate.\n\ | 575 to convert into a type that we don't know about or that is inappropriate.\n\ |
581 This hook doesn't let you change the behavior of Emacs's selection replies,\n\ | 576 This hook doesn't let you change the behavior of Emacs's selection replies,\n\ |
582 it merely informs you that they have happened."); | 577 it merely informs you that they have happened."); |
583 Vns_sent_selection_hooks = Qnil; | 578 Vns_sent_selection_hooks = Qnil; |
584 | 579 |
585 DEFVAR_LISP ("selection-converter-alist", &Vselection_converter_alist, | 580 DEFVAR_LISP ("selection-converter-alist", Vselection_converter_alist, |
586 "An alist associating X Windows selection-types with functions.\n\ | 581 "An alist associating X Windows selection-types with functions.\n\ |
587 These functions are called to convert the selection, with three args:\n\ | 582 These functions are called to convert the selection, with three args:\n\ |
588 the name of the selection (typically `PRIMARY', `SECONDARY', or `CLIPBOARD');\n\ | 583 the name of the selection (typically `PRIMARY', `SECONDARY', or `CLIPBOARD');\n\ |
589 a desired type to which the selection should be converted;\n\ | 584 a desired type to which the selection should be converted;\n\ |
590 and the local selection value (whatever was given to `x-own-selection').\n\ | 585 and the local selection value (whatever was given to `x-own-selection').\n\ |
595 A return value which is the symbol `NULL'\n\ | 590 A return value which is the symbol `NULL'\n\ |
596 means that a side-effect was executed,\n\ | 591 means that a side-effect was executed,\n\ |
597 and there is no meaningful selection value."); | 592 and there is no meaningful selection value."); |
598 Vselection_converter_alist = Qnil; | 593 Vselection_converter_alist = Qnil; |
599 | 594 |
600 DEFVAR_LISP ("ns-lost-selection-hooks", &Vns_lost_selection_hooks, | 595 DEFVAR_LISP ("ns-lost-selection-hooks", Vns_lost_selection_hooks, |
601 "A list of functions to be called when Emacs loses an X selection.\n\ | 596 "A list of functions to be called when Emacs loses an X selection.\n\ |
602 \(This happens when some other X client makes its own selection\n\ | 597 \(This happens when some other X client makes its own selection\n\ |
603 or when a Lisp program explicitly clears the selection.)\n\ | 598 or when a Lisp program explicitly clears the selection.)\n\ |
604 The functions are called with one argument, the selection type\n\ | 599 The functions are called with one argument, the selection type\n\ |
605 \(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD')."); | 600 \(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD')."); |