Mercurial > emacs
comparison src/globals.h @ 112374:4d90cea362a3
Fix X11 compilation failure.
* globals.h (struct emacs_globals): Document f_Vselection_alist.
* xselect.c (Vselection_alist): Remove declaration, moving its
documentation to globals.h. This fixes a compilation failure
induced by the earlier change to globals.h today.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Wed, 19 Jan 2011 15:32:42 -0800 |
parents | 7935463f385e |
children | 051c56a77c5c |
comparison
equal
deleted
inserted
replaced
112373:f279fb6c0f32 | 112374:4d90cea362a3 |
---|---|
1699 /* Lisp communications */ | 1699 /* Lisp communications */ |
1700 Lisp_Object f_ns_input_file, f_ns_input_font, f_ns_input_fontsize, | 1700 Lisp_Object f_ns_input_file, f_ns_input_font, f_ns_input_fontsize, |
1701 f_ns_input_line; | 1701 f_ns_input_line; |
1702 Lisp_Object f_ns_input_color, f_ns_input_text, f_ns_working_text; | 1702 Lisp_Object f_ns_input_color, f_ns_input_text, f_ns_working_text; |
1703 Lisp_Object f_ns_input_spi_name, f_ns_input_spi_arg; | 1703 Lisp_Object f_ns_input_spi_name, f_ns_input_spi_arg; |
1704 | 1704 |
1705 /* Specifies which emacs modifier should be generated when NS receives | 1705 /* Specifies which emacs modifier should be generated when NS receives |
1706 the Alternate modifier. May be Qnone or any of the modifier lisp symbols. | 1706 the Alternate modifier. May be Qnone or any of the modifier lisp symbols. |
1707 */ | 1707 */ |
1708 Lisp_Object f_ns_alternate_modifier; | 1708 Lisp_Object f_ns_alternate_modifier; |
1709 | 1709 |
1749 /* Toolkit version support. */ | 1749 /* Toolkit version support. */ |
1750 Lisp_Object f_Vns_version_string; | 1750 Lisp_Object f_Vns_version_string; |
1751 | 1751 |
1752 Lisp_Object f_Vns_sent_selection_hooks; | 1752 Lisp_Object f_Vns_sent_selection_hooks; |
1753 Lisp_Object f_Vns_lost_selection_hooks; | 1753 Lisp_Object f_Vns_lost_selection_hooks; |
1754 | |
1755 /* This is an association list whose elements are of the form | |
1756 ( SELECTION-NAME SELECTION-VALUE SELECTION-TIMESTAMP FRAME) | |
1757 SELECTION-NAME is a lisp symbol, whose name is the name of an X Atom. | |
1758 SELECTION-VALUE is the value that emacs owns for that selection. | |
1759 It may be any kind of Lisp object. | |
1760 SELECTION-TIMESTAMP is the time at which emacs began owning this | |
1761 selection, as a cons of two 16-bit numbers (making a 32 bit time.) | |
1762 FRAME is the frame for which we made the selection. | |
1763 If there is an entry in this alist, then it can be assumed that Emacs owns | |
1764 that selection. | |
1765 The only (eq) parts of this list that are visible from Lisp are the | |
1766 selection-values. */ | |
1754 Lisp_Object f_Vselection_alist; | 1767 Lisp_Object f_Vselection_alist; |
1755 | 1768 |
1756 Lisp_Object f_Vns_reg_to_script; | 1769 Lisp_Object f_Vns_reg_to_script; |
1757 | 1770 |
1758 | 1771 |
2880 globals.f_Vns_lost_selection_hooks | 2893 globals.f_Vns_lost_selection_hooks |
2881 #define Vselection_alist \ | 2894 #define Vselection_alist \ |
2882 globals.f_Vselection_alist | 2895 globals.f_Vselection_alist |
2883 #define Vns_reg_to_script \ | 2896 #define Vns_reg_to_script \ |
2884 globals.f_Vns_reg_to_script | 2897 globals.f_Vns_reg_to_script |
2885 | |
2886 |