From e1ef0dac0866570df62f96fb004de896f6e82397 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 19 Jan 2011 15:32:42 -0800 Subject: [PATCH] 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. --- src/ChangeLog | 8 ++++++++ src/globals.h | 17 ++++++++++++++--- src/xselect.c | 15 --------------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 79cc893eaa..735b6e4789 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2011-01-19 Paul Eggert + + 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 * unexmacosx.c: Include config.h before unistd.h (Bug#7859). diff --git a/src/globals.h b/src/globals.h index f8563c4d93..8f4749054e 100644 --- a/src/globals.h +++ b/src/globals.h @@ -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 - - diff --git a/src/xselect.c b/src/xselect.c index aec216db13..0f57677a30 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -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); } - -- 2.20.1