Update FSF's address in the preamble.

[bpt/emacs.git] / src / xterm.h

diff --git a/src/xterm.h b/src/xterm.h
index 47f79d6..cf3f910 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
@@ -79,12 +80,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #endif
 #endif
 
-#ifdef XlibSpecificationRelease
-#if XlibSpecificationRelease >= 6
-#define HAVE_X11R6 1
-#endif
-#endif
-
 #ifdef HAVE_X11R5
 #define HAVE_X_I18N
 #include <X11/Xlocale.h>
@@ -709,11 +704,15 @@ struct scroll_bar {
    by this structure.  */
 
 /* For an event of kind selection_request_event,
-   this structure really describes the contents.  */
+   this structure really describes the contents.
+   **Don't make this struct longer!**
+   If it overlaps the frame_or_window field of struct input_event,
+   that will cause GC to crash.  */
 struct selection_input_event
 {
   int kind;
   Display *display;
+  /* We spell it with an "o" here because X does.  */
   Window requestor;
   Atom selection, target, property;
   Time time;
@@ -721,6 +720,7 @@ struct selection_input_event
 
 #define SELECTION_EVENT_DISPLAY(eventp)        \
   (((struct selection_input_event *) (eventp))->display)
+/* We spell it with an "o" here because X does.  */
 #define SELECTION_EVENT_REQUESTOR(eventp)      \
   (((struct selection_input_event *) (eventp))->requestor)
 #define SELECTION_EVENT_SELECTION(eventp)      \