Re: bug#7859: syncing Emacs from sources maintained elsewhere

[Paul Eggert]

One minor thing: the recent change to get trunk builds working
on MacOS X unfortunately broke builds under GNU/Linux with X11.
I installed this further patch; hope it's OK.

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.
=== modified file 'src/globals.h'
--- src/globals.h       2011-01-19 22:11:33 +0000
+++ src/globals.h       2011-01-19 23:28:30 +0000
@@ -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;
=== modified file 'src/xselect.c'
--- src/xselect.c       2011-01-18 20:45:37 +0000
+++ src/xselect.c       2011-01-19 23:28:37 +0000
@@ -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