Mercurial > emacs
changeset 112378:bc91751b1f8a
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Wed, 19 Jan 2011 15:58:00 -0800 |
| parents | 5855bdef20c9 (current diff) 4d90cea362a3 (diff) |
| children | b14f98859016 75fec4affb13 |
| files | |
| diffstat | 3 files changed, 22 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jan 19 15:56:53 2011 -0800 +++ b/src/ChangeLog Wed Jan 19 15:58:00 2011 -0800 @@ -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).
--- a/src/globals.h Wed Jan 19 15:56:53 2011 -0800 +++ b/src/globals.h Wed Jan 19 15:58:00 2011 -0800 @@ -1701,7 +1701,7 @@ 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 @@ 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 @@ globals.f_Vselection_alist #define Vns_reg_to_script \ globals.f_Vns_reg_to_script - -
--- a/src/xselect.c Wed Jan 19 15:56:53 2011 -0800 +++ b/src/xselect.c Wed Jan 19 15:58:00 2011 -0800 @@ -127,20 +127,6 @@ /* 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 @@ Qforeign_selection = intern_c_string ("foreign-selection"); staticpro (&Qforeign_selection); } -