procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix X11 compilation failure.

Browse source 
* 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.
This commit is contained in:
Paul Eggert 2011-01-19 15:32:42 -08:00
parent a2e3ac9968
commit e1ef0dac08
3 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2011-01-19 Paul Eggert <eggert@cs.ucla.edu>
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.
2011-01-19 Jan Djärv <jan.h.d@swipnet.se>
* unexmacosx.c: Include config.h before unistd.h (Bug#7859).

17
src/globals.h
View file

@ -1701,7 +1701,7 @@ struct emacs_globals
f_ns_input_line;
Lisp_Object f_ns_input_color, f_ns_input_text, f_ns_working_text;
Lisp_Object f_ns_input_spi_name, f_ns_input_spi_arg;
/* Specifies which emacs modifier should be generated when NS receives
the Alternate modifier. May be Qnone or any of the modifier lisp symbols.
*/
@ -1751,6 +1751,19 @@ struct emacs_globals
Lisp_Object f_Vns_sent_selection_hooks;
Lisp_Object f_Vns_lost_selection_hooks;
/* This is an association list whose elements are of the form
( SELECTION-NAME SELECTION-VALUE SELECTION-TIMESTAMP FRAME)
SELECTION-NAME is a lisp symbol, whose name is the name of an X Atom.
SELECTION-VALUE is the value that emacs owns for that selection.
It may be any kind of Lisp object.
SELECTION-TIMESTAMP is the time at which emacs began owning this
selection, as a cons of two 16-bit numbers (making a 32 bit time.)
FRAME is the frame for which we made the selection.
If there is an entry in this alist, then it can be assumed that Emacs owns
that selection.
The only (eq) parts of this list that are visible from Lisp are the
selection-values. */
Lisp_Object f_Vselection_alist;
Lisp_Object f_Vns_reg_to_script;
@ -2882,5 +2895,3 @@ extern struct emacs_globals globals;
globals.f_Vselection_alist
#define Vns_reg_to_script \
globals.f_Vns_reg_to_script

15
src/xselect.c
View file

@ -127,20 +127,6 @@ static Lisp_Object Qforeign_selection;
/* Defined in keyboard.c. */
extern unsigned long last_event_timestamp;
/* This is an association list whose elements are of the form
( SELECTION-NAME SELECTION-VALUE SELECTION-TIMESTAMP FRAME)
SELECTION-NAME is a lisp symbol, whose name is the name of an X Atom.
SELECTION-VALUE is the value that emacs owns for that selection.
It may be any kind of Lisp object.
SELECTION-TIMESTAMP is the time at which emacs began owning this selection,
as a cons of two 16-bit numbers (making a 32 bit time.)
FRAME is the frame for which we made the selection.
If there is an entry in this alist, then it can be assumed that Emacs owns
that selection.
The only (eq) parts of this list that are visible from Lisp are the
selection-values. */
static Lisp_Object Vselection_alist;
/* Define a queue to save up SELECTION_REQUEST_EVENT events for later
@ -2700,4 +2686,3 @@ A value of 0 means wait as long as necessary. This is initialized from the
Qforeign_selection = intern_c_string ("foreign-selection");
staticpro (&Qforeign_selection);
}