Trailing whitespace deleted.

25 files changed, 188 insertions, 188 deletions

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 5196d0ccc12..8e1b3742d9b 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/emacs//emacs/oldXMenu/Activate.c,v 1.3 2000/07/21 14:36:24 gerd Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/Activate.c,v 1.4 2002/04/22 18:27:03 jhd Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 #include "copyright.h"
@@ -28,7 +28,7 @@
  *
  *			1)	If at any time an error occurs the data
  *				pointer is left untouched and XM_FAILURE
- *				is returned.  
+ *				is returned.
  *
  *			2)	When a selection request is received (i.e.,
  *				when the specified mouse event occurs) the
@@ -42,7 +42,7 @@
  *				will be left untouched and XM_NO_SELECT will
  *				be returned.
  *
- *			4)	If the selection that was current at the time 
+ *			4)	If the selection that was current at the time
  *				a selection request is made is not an active
  *				selection the data pointer will be left
  *				untouched and XM_IA_SELECT will be returned.
@@ -131,7 +131,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
 
     XMEventQue *feq = NULL;    		/* Foreign event queue. */
     XMEventQue *feq_tmp;		/* Foreign event queue temporary. */
-    
+
     /*
      * If there are no panes in the menu then return failure
      * because the menu is not initialized.
@@ -162,14 +162,14 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
      * Compute origin of menu so that cursor is in
      * Correct pane and selection.
      */
-    _XMTransToOrigin(display, 
-		     menu, 
-		     cur_p, cur_s, 
-		     x_pos, y_pos, 
+    _XMTransToOrigin(display,
+		     menu,
+		     cur_p, cur_s,
+		     x_pos, y_pos,
 		     &orig_x, &orig_y);
     menu->x_pos = orig_x;	/* Store X and Y coords of menu. */
     menu->y_pos = orig_y;
-    
+
     if (XMenuRecompute(display, menu) == XM_FAILURE) {
 	return(XM_FAILURE);
     }
@@ -212,11 +212,11 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
      * not provided an event handler.
      */
     XSync(display, 0);
-    
+
     /*
      * Grab the mouse for menu input.
      */
-    
+
     status = XGrabPointer(
 			  display,
 			  menu->parent,
@@ -239,7 +239,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
         if (status != Success)
           XUngrabPointer(display, CurrentTime);
       }
-    
+
     if (status == _X_FAILURE) {
 	_XMErrorCode = XME_GRAB_MOUSE;
 	return(XM_FAILURE);
@@ -250,7 +250,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
      */
     XMapWindow(display, cur_p->window);
     for (p_ptr = menu->p_list->next;
-	 p_ptr != cur_p; 
+	 p_ptr != cur_p;
 	 p_ptr = p_ptr->next)
       XMapWindow(display, p_ptr->window);
     for (p_ptr = cur_p->next;
@@ -260,7 +260,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
 
     XRaiseWindow(display, cur_p->window);	/* Make sure current */
 						/* pane is on top. */
-    
+
     cur_s = NULL;			/* Clear current selection. */
 
     /*
@@ -271,7 +271,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
 	switch (event.type) {		/* Dispatch on the event type. */
     case Expose:
 	    event_xmp = (XMPane *)XLookUpAssoc(display,
-					       menu->assoc_tab, 
+					       menu->assoc_tab,
 					       event.xexpose.window);
 	    if (event_xmp == NULL) {
 		/*
@@ -292,7 +292,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
 	    }
 	    if (event_xmp->activated) {
 		XSetWindowBackground(display,
-				     event_xmp->window, 
+				     event_xmp->window,
 				     menu->bkgnd_color);
 	    }
 	    else {
@@ -303,13 +303,13 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
 	    _XMRefreshPane(display, menu, event_xmp);
 	    break;
     case EnterNotify:
-	    /* 
+	    /*
 	     * First wait a small period of time, and see
 	     * if another EnterNotify event follows hard on the
 	     * heels of this one. i.e., the user is simply
 	     * "passing through". If so, ignore this one.
 	     */
-	
+
 	    event_xmw = (XMWindow *)XLookUpAssoc(display,
 						 menu->assoc_tab,
 						 event.xcrossing.window);
@@ -324,11 +324,11 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
 		    if(peek_event.type == LeaveNotify) {
 			break;
 		    }
-		}			  
+		}
 		cur_s = (XMSelect *)event_xmw;
 		help_callback (cur_s->help_string,
 			       cur_p->serial, cur_s->serial);
-		
+
 		/*
 		 * If the pane we are in is active and the
 		 * selection entered is active then activate
@@ -385,7 +385,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
 		 * take it from here.  -- caveh@eng.sun.com.
 		 */
 		XSetWindowBackground(display,
-				     event_xmp->window, 
+				     event_xmp->window,
 				     menu->bkgnd_color);
 		_XMRefreshPane(display, menu, event_xmp);
 #endif
@@ -400,7 +400,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
 						 );
 	    if (event_xmw == NULL) break;
 	    if(cur_s == NULL) break;
-	    
+
 	    /*
 	     * If the current selection was activated then
 	     * deactivate it.
@@ -411,7 +411,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
 	    }
 	    cur_s = NULL;
 	    break;
-	
+
     case ButtonPress:
     case ButtonRelease:
 		*p_num = cur_p->serial;
@@ -471,7 +471,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
      */
     for ( p_ptr = menu->p_list->next;
 	 p_ptr != menu->p_list;
-	 p_ptr = p_ptr->next) 
+	 p_ptr = p_ptr->next)
       {
 	  XUnmapWindow(display, p_ptr->window);
       }
@@ -482,7 +482,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
     XUngrabPointer(display, CurrentTime);
     XUngrabKeyboard(display, CurrentTime);
 
-    /* 
+    /*
      * Restore bits under where the menu was if we managed
      * to save them and free the pixmap.
      */
@@ -502,7 +502,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
      * Synchronize the X buffers and the X event queue.
      */
     XSync(display, 0);
-    
+
     /*
      * Dispatch any events remaining on the queue.
      */
@@ -557,7 +557,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
 	feq = feq_tmp->next;
 	free((char *)feq_tmp);
     }
-    
+
     /*
      * Return successfully.
      */
diff --git a/oldXMenu/AddPane.c b/oldXMenu/AddPane.c
index 739cdfe43e8..ab8ed42b012 100644
--- a/oldXMenu/AddPane.c
+++ b/oldXMenu/AddPane.c
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/AddPane.c,v 1.1 1992/04/11 22:10:17 jimb Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/AddPane.c,v 1.1 1999/10/03 19:34:51 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -18,14 +18,14 @@
 
 int
 XMenuAddPane(display, menu, label, active)
-    Display *display;           
+    Display *display;
     register XMenu *menu;	/* Menu object to be modified. */
     register char *label;	/* Selection label. */
     int active;			/* Make selection active? */
 {
     register XMPane *pane;	/* Newly created pane. */
     register XMSelect *select;	/* Initial selection for the new pane. */
-        
+
     int label_length;		/* Label length in characters. */
     int label_width;		/* Label width in pixels. */
 
@@ -50,7 +50,7 @@ XMenuAddPane(display, menu, label, active)
 	_XMErrorCode = XME_CALLOC;
 	return(XM_FAILURE);
     }
-    
+
     /*
      * Determine label size.
      */
@@ -58,7 +58,7 @@ XMenuAddPane(display, menu, label, active)
     label_width = XTextWidth(menu->p_fnt_info,
 			     label,
 			     label_length);
-    
+
     /*
      * Set up the initial selection.
      * Values not explicitly set are zeroed by calloc.
@@ -87,7 +87,7 @@ XMenuAddPane(display, menu, label, active)
     emacs_insque(pane, menu->p_list->prev);
 
     /*
-     * Update the pane count. 
+     * Update the pane count.
      */
     menu->p_count++;
 
diff --git a/oldXMenu/AddSel.c b/oldXMenu/AddSel.c
index 3a25cbdba3a..7807fb66518 100644
--- a/oldXMenu/AddSel.c
+++ b/oldXMenu/AddSel.c
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /gd/gnu/cvsroot/emacs/oldXMenu/AddSel.c,v 1.1 1999/10/03 19:34:52 fx Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/AddSel.c,v 1.2 2000/01/27 15:30:18 gerd Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -32,7 +32,7 @@ XMenuAddSelection(display, menu, p_num, data, label, active, help)
 
     int label_length;		/* Label lenght in characters. */
     int label_width;		/* Label width in pixels. */
-    
+
     /*
      * Check for NULL pointers!
      */
@@ -59,7 +59,7 @@ XMenuAddSelection(display, menu, p_num, data, label, active, help)
      */
     label_length = strlen(label);
     label_width = XTextWidth(menu->s_fnt_info, label, label_length);
-    
+
     /*
      * Fill the XMSelect structure.
      */
@@ -81,7 +81,7 @@ XMenuAddSelection(display, menu, p_num, data, label, active, help)
     select->data = data;
     select->parent_p = pane;
     select->help_string = help;
-    
+
     /*
      * Insert the selection at the end of the selection list.
      */
diff --git a/oldXMenu/ChgSel.c b/oldXMenu/ChgSel.c
index 591fbb7e886..d436a480a1b 100644
--- a/oldXMenu/ChgSel.c
+++ b/oldXMenu/ChgSel.c
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/ChgSel.c,v 1.1 1992/04/11 22:10:17 jimb Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/ChgSel.c,v 1.1 1999/10/03 19:34:54 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -28,7 +28,7 @@ XMenuChangeSelection(display, menu, p_num, s_num, data, data_sw, label, label_sw
 {
     register XMPane *p_ptr;	/* XMPane pointer. */
     register XMSelect *s_ptr;	/* XMSelect pointer. */
-    
+
     int label_length;		/* Label length in characters. */
     int label_width;		/* Label width in pixels. */
 
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index ffbee593421..e500e406349 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -1,4 +1,4 @@
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/Create.c,v 1.4 1993/03/09 18:18:01 jimb Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/Create.c,v 1.1 1999/10/03 19:34:56 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 #include "copyright.h"
@@ -98,7 +98,7 @@ char *x_get_resource_string ();
 
 
 
-static Status 
+static Status
 XAllocDisplayColor(display, map, colorName, color, junk)
     Display *display;
     Colormap map;
@@ -189,7 +189,7 @@ XMenuCreate(display, parent, def_env)
   Pixmap stipple_pixmap;	/* Stipple mask for half-tone text. */
   unsigned long valuemask;
   XGCValues *values;
-    
+
   Window root = RootWindow (display, DefaultScreen (display));
 
   /*
@@ -205,8 +205,8 @@ XMenuCreate(display, parent, def_env)
     _XMErrorCode = XME_CALLOC;
     return(NULL);
   }
-    
-  /* 
+
+  /*
    * Create the XAssocTable
    */
   assoc_tab = (XAssocTable *)XCreateAssocTable(XASSOC_TABLE_SIZE);
@@ -266,14 +266,14 @@ XMenuCreate(display, parent, def_env)
     if (strcmp(def_val, "box") == 0) menu_mode = BOX;
     else if (strcmp(def_val, "invert") == 0) menu_mode = INVERT;
   }
-    
+
   def_val = x_get_resource_string ("menuMouse", "MenuMouse");
   if (
       def_val != NULL &&
       DisplayCells(display, DefaultScreen(display)) > 2 &&
-      XAllocDisplayColor(display, 
-			 DefaultColormap(display, DefaultScreen(display)), 
-			 def_val, 
+      XAllocDisplayColor(display,
+			 DefaultColormap(display, DefaultScreen(display)),
+			 def_val,
 			 &mouse_color, &color_def)
       );
   else if (reverse &&
@@ -282,13 +282,13 @@ XMenuCreate(display, parent, def_env)
 			      "white",
 			      &mouse_color, &color_def)
 	   );
-    
+
   else if (XAllocDisplayColor(display,
 			      DefaultColormap(display, DefaultScreen(display)),
-			      "black", 
+			      "black",
 			      &mouse_color, &color_def)
 	   );
-    
+
   else ;
 
   def_val = x_get_resource_string ("menuBackground", "MenuBackground");
@@ -335,15 +335,15 @@ XMenuCreate(display, parent, def_env)
   def_val = x_get_resource_string ("paneForeground", "PaneForeground");
   if (
       def_val != NULL &&
-      DisplayCells(display, DefaultScreen(display)) > 2 
+      DisplayCells(display, DefaultScreen(display)) > 2
       )
     XAllocDisplayColor(display, DefaultColormap(display,
 						DefaultScreen(display)),
 		       def_val,
 		       &p_frg_color, &color_def);
-	  
+
   else if (reverse) XAllocDisplayColor(display,
-				       DefaultColormap(display, 
+				       DefaultColormap(display,
 						       DefaultScreen(display)),
 				       "white",
 				       &p_frg_color, &color_def);
@@ -362,19 +362,19 @@ XMenuCreate(display, parent, def_env)
 			 &p_bdr_color, &color_def)
       );
   else if (reverse &&
-	   XAllocDisplayColor(display, 
+	   XAllocDisplayColor(display,
 			      DefaultColormap(display, DefaultScreen(display)),
 			      "white",
 			      &p_bdr_color, &color_def)
 	   );
-  else XAllocDisplayColor(display, 
+  else XAllocDisplayColor(display,
 			  DefaultColormap(display, DefaultScreen(display)),
 			  "black",
 			  &p_bdr_color, &color_def);
-    
+
   def_val = x_get_resource_string ("paneBorderWidth", "PaneBorderWidth");
   if (def_val != NULL) p_bdr_width = atoi(def_val);
-    
+
   def_val = x_get_resource_string ("paneSpread", "PaneSpread");
   if (def_val != NULL) p_spread = atof(def_val);
 
@@ -396,7 +396,7 @@ XMenuCreate(display, parent, def_env)
 			 DefaultColormap(display, DefaultScreen(display)),
 			 def_val,
 			 &s_frg_color, &color_def)
-      ); 
+      );
   else if (reverse &&
 	   XAllocDisplayColor(display,
 			      DefaultColormap(display, DefaultScreen(display)),
@@ -409,7 +409,7 @@ XMenuCreate(display, parent, def_env)
 			      &s_frg_color, &color_def)
 	   ) ;
   else ;
-    
+
 
   def_val = x_get_resource_string ("selectionBorder", "SelectionBorder");
   if (
@@ -421,7 +421,7 @@ XMenuCreate(display, parent, def_env)
 			 &s_bdr_color, &color_def)
       ) ;
   else if (reverse &&
-	   XAllocDisplayColor(display, 
+	   XAllocDisplayColor(display,
 			      DefaultColormap(display, DefaultScreen(display)),
 			      "white",
 			      &s_bdr_color, &color_def)
@@ -435,7 +435,7 @@ XMenuCreate(display, parent, def_env)
 
   def_val = x_get_resource_string ("selectionBorderWidth", "SelectionBorderWidth");
   if (def_val != NULL) s_bdr_width = atoi(def_val);
-    
+
   def_val = x_get_resource_string ("selectionSpread", "SelectionSpread");
   if (def_val != NULL) s_spread = atof(def_val);
 
@@ -446,7 +446,7 @@ XMenuCreate(display, parent, def_env)
     char *data = NULL;
     int width, height;
 
-    switch (inact_pnum) 
+    switch (inact_pnum)
       {
       case 0:
 	data = (char *)dimple1_bits;
@@ -495,7 +495,7 @@ XMenuCreate(display, parent, def_env)
   /*
    * Load the mouse cursor.
    */
-	  
+
   switch (menu_style) {
   case LEFT:
     cursor = XCreateBitmapFromData(display,
@@ -510,13 +510,13 @@ XMenuCreate(display, parent, def_env)
 					left_ptrmsk_height);
     mouse_cursor = XCreatePixmapCursor(
 				       display,
-				       cursor, cursor_mask, 
+				       cursor, cursor_mask,
 				       &mouse_color, &bkgnd_color,
 				       left_ptr_x_hot,
 				       left_ptr_y_hot
 				       );
     XFreePixmap(display, cursor);
-    XFreePixmap(display, cursor_mask);	    
+    XFreePixmap(display, cursor_mask);
     break;
   case RIGHT:
     cursor = XCreateBitmapFromData(display,
@@ -537,7 +537,7 @@ XMenuCreate(display, parent, def_env)
 				       right_ptr_y_hot
 				       );
     XFreePixmap(display, cursor);
-    XFreePixmap(display, cursor_mask);	    
+    XFreePixmap(display, cursor_mask);
     break;
   case CENTER:
     cursor = XCreateBitmapFromData(display,
@@ -558,7 +558,7 @@ XMenuCreate(display, parent, def_env)
 				       cntr_ptr_y_hot
 				       );
     XFreePixmap(display, cursor);
-    XFreePixmap(display, cursor_mask);	    
+    XFreePixmap(display, cursor_mask);
     break;
   default:
     /* Error! Invalid style parameter. */
@@ -573,12 +573,12 @@ XMenuCreate(display, parent, def_env)
   /*
    * Open the pane and selection fonts.
    */
-    
+
   p_fnt_info = XLoadQueryFont(display, p_fnt_name);
   if (p_fnt_info == NULL) {
     _XMErrorCode = XME_OPEN_FONT;
     return(NULL);
-	
+
   }
 
   s_fnt_info = XLoadQueryFont(display, s_fnt_name);
@@ -619,7 +619,7 @@ XMenuCreate(display, parent, def_env)
    * Initialize the internal pane and selection creation queues.
    */
   _XMWinQueInit();
-    
+
   /*
    * Create pane, active, and inactive GC's.
    */
@@ -634,9 +634,9 @@ XMenuCreate(display, parent, def_env)
   values->background = bkgnd_color.pixel;
   values->font = p_fnt_info->fid;
   values->line_width = p_bdr_width;
-    
+
   pane_GC = XCreateGC(
-		      display, 
+		      display,
 		      root,
 		      valuemask,
 		      values);
@@ -648,7 +648,7 @@ XMenuCreate(display, parent, def_env)
   values->background = bkgnd_color.pixel;
   values->font = s_fnt_info->fid;
   values->line_width = s_bdr_width;
-  normal_select_GC = XCreateGC(display, 
+  normal_select_GC = XCreateGC(display,
 			       root,
 			       valuemask,
 			       values);
@@ -656,20 +656,20 @@ XMenuCreate(display, parent, def_env)
    * Inverse video selection.
    */
 
-  values->foreground = bkgnd_color.pixel;		
+  values->foreground = bkgnd_color.pixel;
   values->background = s_frg_color.pixel;
   values->font = s_fnt_info->fid;
   values->line_width = s_bdr_width;
-  inverse_select_GC = XCreateGC(display, 
+  inverse_select_GC = XCreateGC(display,
 				root,
 				valuemask,
 				values);
   stipple_pixmap = XCreateBitmapFromData(display,
 					 root,
-					 stipple_bits,		
-					 stipple_width,		
-					 stipple_height);	
-    
+					 stipple_bits,
+					 stipple_width,
+					 stipple_height);
+
   /*
    * Finally, inactive pane header and selections
    */
@@ -680,15 +680,15 @@ XMenuCreate(display, parent, def_env)
   values->line_width = s_bdr_width;
   values->fill_style = FillStippled;
   values->stipple = stipple_pixmap;
-	
-  inact_GC = XCreateGC(display, 
+
+  inact_GC = XCreateGC(display,
 		       root,
 		       valuemask,
 		       values);
 
   valuemask |= (GCGraphicsExposures);
   values->graphics_exposures = False;
-  inact_GC_noexpose = XCreateGC (display, 
+  inact_GC_noexpose = XCreateGC (display,
 				 root,
 				 valuemask, values);
 
diff --git a/oldXMenu/DelPane.c b/oldXMenu/DelPane.c
index cf0354920ce..f656c32ea07 100644
--- a/oldXMenu/DelPane.c
+++ b/oldXMenu/DelPane.c
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/DelPane.c,v 1.1 1992/04/11 22:10:18 jimb Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/DelPane.c,v 1.1 1999/10/03 19:34:57 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -24,7 +24,7 @@ XMenuDeletePane(display, menu, p_num)
     register XMPane *p_ptr;	/* Pointer to pane being deleted. */
     register XMSelect *s_ptr;	/* Pointer to selections being deleted. */
     register XMSelect *s_next;  /* Pointer to next selection to be deleted. */
-        
+
     /*
      * Find the right pane.
      */
@@ -48,7 +48,7 @@ XMenuDeletePane(display, menu, p_num)
      * association table and free their XMSelect structures.
      */
     for (
-	s_ptr = p_ptr->s_list->next; 
+	s_ptr = p_ptr->s_list->next;
 	s_ptr != p_ptr->s_list;
 	s_ptr = s_next
     ) {
@@ -63,13 +63,13 @@ XMenuDeletePane(display, menu, p_num)
 	 * Destroy the selection transparencies.
 	 */
 	XDestroySubwindows(display, p_ptr->window);
-    
+
 	/*
 	 * Destroy the pane window.
 	 */
 	XDestroyWindow(display, p_ptr->window);
     }
-    
+
     /*
      * Free the pane's XMPane structure.
      */
diff --git a/oldXMenu/DelSel.c b/oldXMenu/DelSel.c
index 9f520860df8..76adcc17f2f 100644
--- a/oldXMenu/DelSel.c
+++ b/oldXMenu/DelSel.c
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/DelSel.c,v 1.1 1992/04/11 22:10:18 jimb Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/DelSel.c,v 1.1 1999/10/03 19:34:58 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -24,7 +24,7 @@ XMenuDeleteSelection(display, menu, p_num, s_num)
 {
     register XMPane *p_ptr;	/* Pointer to pane being deleted. */
     register XMSelect *s_ptr;	/* Pointer to selections being deleted. */
-        
+
     /*
      * Find the right pane.
      */
@@ -53,7 +53,7 @@ XMenuDeleteSelection(display, menu, p_num, s_num)
      * Destroy the selection transparency.
      */
     if (s_ptr->window) XDestroyWindow(display, s_ptr->window);
-    
+
     /*
      * Free the selection's XMSelect structure.
      */
diff --git a/oldXMenu/Destroy.c b/oldXMenu/Destroy.c
index b7f34fc4788..588af2ad37d 100644
--- a/oldXMenu/Destroy.c
+++ b/oldXMenu/Destroy.c
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/Destroy.c,v 1.1 1992/04/11 22:10:18 jimb Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/Destroy.c,v 1.1 1999/10/03 19:34:59 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -80,33 +80,33 @@ XMenuDestroy(display, menu)
      */
     if ((menu->p_bdr_color != BlackPixel(display, DefaultScreen(display))) && (menu->p_bdr_color != WhitePixel(display, DefaultScreen(display))))
 	XFreeColors(
-		    display, 
+		    display,
 		    DefaultColormap(display, DefaultScreen(display)),
-		    &menu->p_bdr_color, 
+		    &menu->p_bdr_color,
 		    1, 0);
     if ((menu->s_bdr_color != BlackPixel(display, DefaultScreen(display))) && (menu->s_bdr_color != WhitePixel(display, DefaultScreen(display))))
 	XFreeColors(
-		    display, 
-		    DefaultColormap(display, DefaultScreen(display)), 
-		    &menu->s_bdr_color, 
+		    display,
+		    DefaultColormap(display, DefaultScreen(display)),
+		    &menu->s_bdr_color,
 		    1, 0);
     if ((menu->p_frg_color != BlackPixel(display, DefaultScreen(display))) && (menu->p_frg_color != WhitePixel(display, DefaultScreen(display))))
 	XFreeColors(
-		    display, 
+		    display,
 		    DefaultColormap(display, DefaultScreen(display)),
-		    &menu->p_frg_color, 
+		    &menu->p_frg_color,
 		    1, 0);
     if ((menu->s_frg_color != BlackPixel(display, DefaultScreen(display))) && (menu->s_frg_color != WhitePixel(display, DefaultScreen(display))))
 	XFreeColors(
-		    display, 
+		    display,
 		    DefaultColormap(display, DefaultScreen(display)),
-		    &menu->s_frg_color, 
+		    &menu->s_frg_color,
 		    1, 0);
     if ((menu->bkgnd_color != BlackPixel(display, DefaultScreen(display))) && (menu->bkgnd_color != WhitePixel(display, DefaultScreen(display))))
 	XFreeColors(
-		    display, 
+		    display,
 		    DefaultColormap(display, DefaultScreen(display)),
-		    &menu->bkgnd_color, 
+		    &menu->bkgnd_color,
 		    1, 0);
 
     /*
diff --git a/oldXMenu/FindPane.c b/oldXMenu/FindPane.c
index a4bed439076..af1ecce51bb 100644
--- a/oldXMenu/FindPane.c
+++ b/oldXMenu/FindPane.c
@@ -1,12 +1,12 @@
 #include "copyright.h"
 
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/FindPane.c,v 1.1 1992/04/11 22:10:19 jimb Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/FindPane.c,v 1.1 1999/10/03 19:35:02 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
  *
- *	XMenuFindPane - Find the first menu pane who's label matches a 
+ *	XMenuFindPane - Find the first menu pane who's label matches a
  *			particular string.
  *
  *	Author:		Tony Della Fera, DEC
@@ -17,7 +17,7 @@
 #include "XMenuInt.h"
 
 int
-XMenuFindPane(menu, label) 
+XMenuFindPane(menu, label)
     register XMenu *menu;
     register char *label;
 {
diff --git a/oldXMenu/InsPane.c b/oldXMenu/InsPane.c
index 7a0d6e3ec63..25fa3390293 100644
--- a/oldXMenu/InsPane.c
+++ b/oldXMenu/InsPane.c
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/InsPane.c,v 1.1 1992/04/11 22:10:19 jimb Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/InsPane.c,v 1.1 1999/10/03 19:35:04 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -27,7 +27,7 @@ XMenuInsertPane(menu, p_num, label, active)
     register XMPane *p_ptr;	/* XMPane pointer. */
     register XMPane *pane;	/* Newly created pane. */
     register XMSelect *select;	/* Initial selection for the new pane. */
-        
+
     int label_length;		/* Label length in characters. */
     int label_width;		/* Label width in pixels. */
 
@@ -95,7 +95,7 @@ XMenuInsertPane(menu, p_num, label, active)
     emacs_insque(pane, p_ptr);
 
     /*
-     * Update the pane count. 
+     * Update the pane count.
      */
     menu->p_count++;
 
diff --git a/oldXMenu/InsSel.c b/oldXMenu/InsSel.c
index 200f57574ef..b2c75c1043a 100644
--- a/oldXMenu/InsSel.c
+++ b/oldXMenu/InsSel.c
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/InsSel.c,v 1.1 1992/04/11 22:10:19 jimb Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/InsSel.c,v 1.1 1999/10/03 19:35:05 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -32,7 +32,7 @@ XMenuInsertSelection(menu, p_num, s_num, data, label, active)
 
     int label_length;		/* Label length in characters. */
     int label_width;		/* Label width in pixels. */
-    
+
     /*
      * Check for NULL pointers!
      */
diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c
index 39a6a3be6a4..a8941bf3ee2 100644
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/Internal.c,v 1.1 1992/04/11 22:10:20 jimb Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/Internal.c,v 1.1 1999/10/03 19:35:07 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -51,7 +51,7 @@ static XMWinQue _XMWinQue;
 /*
  * _XMErrorCode - Global XMenu error code.
  */
-int _XMErrorCode = XME_NO_ERROR; 
+int _XMErrorCode = XME_NO_ERROR;
 /*
  * _XMErrorList - Global XMenu error code description strings.
  */
@@ -204,7 +204,7 @@ _XMWinQueFlush(display, menu, pane, select)
     /*
      * If the pane window queue is not empty...
      */
-    
+
     if (_XMWinQue.pq_size > 0) {
 	/*
 	 * set up attributes for pane window to be created.
@@ -214,7 +214,7 @@ _XMWinQueFlush(display, menu, pane, select)
 	attributes->border_pixel = menu->p_bdr_color;
 	attributes->background_pixmap = menu->inact_pixmap;
 	attributes->override_redirect = True;
-	
+
 	/*
 	 * Create all the pending panes in order, so that the
 	 * current pane will be on top, with the others
@@ -222,7 +222,7 @@ _XMWinQueFlush(display, menu, pane, select)
 	 */
 	for (pq_index = _XMWinQue.pq_size - 1;
 	     pq_index >= 0;
-	     pq_index--) 
+	     pq_index--)
 	  {
 	      p_ptr = _XMWinQue.pq[pq_index];  /* Retrieve next pane. */
 	      if (p_ptr == pane) break;
@@ -243,7 +243,7 @@ _XMWinQueFlush(display, menu, pane, select)
 	  }
 	for (pq_index = 0;
 	     pq_index < _XMWinQue.pq_size;
-	     pq_index++) 
+	     pq_index++)
 	  {
 	      p_ptr = _XMWinQue.pq[pq_index];	/* Retrieve next pane. */
 	      p_ptr->window = XCreateWindow(display,
@@ -273,7 +273,7 @@ _XMWinQueFlush(display, menu, pane, select)
     /*
      * If the selection window queue is not empty...
      */
-    
+
     if (_XMWinQue.sq_size > 0) {
 
 	for (sq_index = 0; sq_index < _XMWinQue.sq_size; sq_index++) {
@@ -293,10 +293,10 @@ _XMWinQueFlush(display, menu, pane, select)
 				   CopyFromParent,
 				   0,
 				   attributes);
-	    
+
 	    /*
 	     * Insert the new window id and its
-	     * associated XMSelect structure into the 
+	     * associated XMSelect structure into the
 	     * association table.
 	     */
 	    XMakeAssoc(display, menu->assoc_tab, s_ptr->window, s_ptr);
@@ -371,7 +371,7 @@ _XMGetSelectionPtr(p_ptr, s_num)
 {
     register XMSelect *s_ptr;	/* Selection pointer to be returned. */
     register int i;		/* Loop counter. */
-    
+
     /*
      * Is the selection number out of range?
      */
@@ -400,7 +400,7 @@ _XMGetSelectionPtr(p_ptr, s_num)
  *			 global values.
  */
 _XMRecomputeGlobals(display, menu)
-    register Display *display; /*X11 display variable. */	
+    register Display *display; /*X11 display variable. */
     register XMenu *menu;	/* Menu object to compute from. */
 {
     register XMPane *p_ptr;	/* Pane pointer. */
@@ -418,7 +418,7 @@ _XMRecomputeGlobals(display, menu)
     int s_width;		/* Selection window width. */
 
     int screen;			/* DefaultScreen holder. */
-    
+
     /*
      * For each pane...
      */
@@ -427,14 +427,14 @@ _XMRecomputeGlobals(display, menu)
 	p_ptr != menu->p_list;
 	p_ptr = p_ptr->next
     ){
-	
+
 	/*
 	 * Recompute maximum pane label width.
 	 */
 	max_p_label = max(max_p_label, p_ptr->label_width);
 
 	/*
-	 * Recompute maximum selection count. 
+	 * Recompute maximum selection count.
 	 */
 	s_count = max(s_count, p_ptr->s_count);
 
@@ -495,7 +495,7 @@ _XMRecomputeGlobals(display, menu)
     menu->p_width = p_width;
     menu->s_width = s_width;
 
-    /* 
+    /*
      * Ensure that the origin of the menu is placed so that
      * None of the panes ore selections are off the screen.
      */
@@ -522,10 +522,10 @@ _XMRecomputePane(display, menu, p_ptr, p_num)
 {
     register int window_x;	/* Recomputed window X coordinate. */
     register int window_y;	/* Recomputed window Y coordinate. */
-    
+
     unsigned long change_mask;	/* Value mask to reconfigure window. */
     XWindowChanges *changes;	/* Values to use in configure window. */
-    
+
     register Bool config_p = False;	/* Reconfigure pane window? */
 
     /*
@@ -558,7 +558,7 @@ _XMRecomputePane(display, menu, p_ptr, p_num)
     window_y += menu->y_pos;
 
     /*
-     * If the newly compute pane coordinates differ from the 
+     * If the newly compute pane coordinates differ from the
      * current coordinates, reset the current coordinates and
      * reconfigure the pane.
      */
@@ -608,7 +608,7 @@ _XMRecomputePane(display, menu, p_ptr, p_num)
 	    changes->y = p_ptr->window_y;
 	    changes->width = p_ptr->window_w;
 	    changes->height = p_ptr->window_h;
-	    
+
 	    XConfigureWindow(
 			     display,
 			     p_ptr->window,
@@ -616,7 +616,7 @@ _XMRecomputePane(display, menu, p_ptr, p_num)
 			     changes
 			     );
 	    free(changes);
-	    
+
 	}
 	else {
 	    if (_XMWinQueAddPane(display, menu, p_ptr) == _FAILURE) {
@@ -624,7 +624,7 @@ _XMRecomputePane(display, menu, p_ptr, p_num)
 	    }
 	}
     }
- 
+
     /*
      * Recompute label X position.
      */
@@ -673,7 +673,7 @@ _XMRecomputeSelection(display, menu, s_ptr, s_num)
     register Bool config_s = False;	/* Reconfigure selection window? */
     XWindowChanges *changes;		/* Values to change in configure. */
     unsigned long change_mask;		/* Value mask for XConfigureWindow. */
-    
+
     /*
      * If the selection serial numbers are out of order, begin
      * resequencing selections.  Recompute selection window coordinates
@@ -735,7 +735,7 @@ _XMRecomputeSelection(display, menu, s_ptr, s_num)
 	    changes->y = s_ptr->window_y;
 	    changes->width = s_ptr->window_w;
 	    changes->height = s_ptr->window_h;
-	    
+
 	    XConfigureWindow(
 			     display,
 			     s_ptr->window,
@@ -743,7 +743,7 @@ _XMRecomputeSelection(display, menu, s_ptr, s_num)
 			     changes
 			     );
 	    free(changes);
-	    
+
 	}
 	else {
 	    if (_XMWinQueAddSelection(display, menu, s_ptr) == _FAILURE) {
@@ -775,7 +775,7 @@ _XMRecomputeSelection(display, menu, s_ptr, s_num)
      * Recompute label Y position.
      */
     s_ptr->label_y = s_ptr->window_y + menu->s_fnt_info->max_bounds.ascent + menu->s_fnt_pad + menu->s_bdr_width;
-    
+
     /*
      * All went well, return successfully.
      */
@@ -787,7 +787,7 @@ _XMRecomputeSelection(display, menu, s_ptr, s_num)
 
 /*
  * _XMTransToOrigin - Internal subroutine to translate the point at
- *		      the center of the current pane and selection to the 
+ *		      the center of the current pane and selection to the
  *		      the menu origin.
  *
  *	WARNING! ******	Be certain that all menu dependencies have been
@@ -806,7 +806,7 @@ _XMTransToOrigin(display, menu, p_ptr, s_ptr, x_pos, y_pos, orig_x, orig_y)
 {
     register int l_orig_x;	/* Local X coordinate of the menu origin. */
     register int l_orig_y;	/* Local Y coordinate of the menu origin. */
-    
+
     /*
      * Translate the menu origin such that the cursor hot point will be in the
      * center of the desired current selection and pane.
@@ -863,7 +863,7 @@ _XMRefreshPane(display, menu, pane)
     register XMSelect *s_ptr;
 
     /*
-     * First clear the pane. 
+     * First clear the pane.
      */
     XClearWindow(display, pane->window);
     if (!pane->activated) {
@@ -916,12 +916,12 @@ _XMRefreshPane(display, menu, pane)
 	}
     }
 }
-    
-    
+
+
 
 
 /*
- * _XMRefreshSelection - Internal subroutine that refreshes 
+ * _XMRefreshSelection - Internal subroutine that refreshes
  *			 a single selection window.
  */
 _XMRefreshSelection(display, menu, select)
@@ -932,7 +932,7 @@ _XMRefreshSelection(display, menu, select)
     register int width = select->window_w;
     register int height = select->window_h;
     register int bdr_width = menu->s_bdr_width;
-    
+
     if (select->type == SEPARATOR) {
         XDrawLine(display,
                   select->parent_p->window,
@@ -944,11 +944,11 @@ _XMRefreshSelection(display, menu, select)
     }
     else if (select->activated) {
 	if (menu->menu_mode == INVERT) {
-	    XFillRectangle(display, 
+	    XFillRectangle(display,
 			   select->parent_p->window,
 			   menu->normal_select_GC,
 			   select->window_x, select->window_y,
-			   width, height); 
+			   width, height);
 	    XDrawString(display,
 			select->parent_p->window,
 			menu->inverse_select_GC,
@@ -963,7 +963,7 @@ _XMRefreshSelection(display, menu, select)
 	     * are slow compared to raster-ops lets use a raster-op to
 	     * draw the boxes.
              */
-	    
+
 	    XDrawRectangle(display,
 			   select->parent_p->window,
 			   menu->normal_select_GC,
@@ -980,7 +980,7 @@ _XMRefreshSelection(display, menu, select)
         }
     }
     else {
-	XClearArea(display, 
+	XClearArea(display,
 		   select->parent_p->window,
 		   select->window_x, select->window_y,
 		   width, height,
diff --git a/oldXMenu/Locate.c b/oldXMenu/Locate.c
index 1e02807de96..145812dc3b3 100644
--- a/oldXMenu/Locate.c
+++ b/oldXMenu/Locate.c
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/Locate.c,v 1.1 1992/04/11 22:10:20 jimb Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/Locate.c,v 1.1 1999/10/03 19:35:09 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -31,7 +31,7 @@ XMenuLocate(display, menu, p_num, s_num, x_pos, y_pos, ul_x, ul_y, width, height
 {
     register XMPane *p_ptr;	/* XMPane pointer. */
     register XMSelect *s_ptr;	/* XMSelect pointer. */
-    
+
     /*
      * Are the position arguments positive?
      */
diff --git a/oldXMenu/Post.c b/oldXMenu/Post.c
index 471b1d60dc0..d10b04945d0 100644
--- a/oldXMenu/Post.c
+++ b/oldXMenu/Post.c
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /gd/gnu/cvsroot/emacs/oldXMenu/Post.c,v 1.1 1999/10/03 19:35:10 fx Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/Post.c,v 1.2 2000/01/27 15:30:47 gerd Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -9,7 +9,7 @@
  *	XMenuPost -	Maps a given menu to the display and activates
  *			the menu for user selection.  The user is allowed to
  *			specify the mouse button event mask that will be used
- *			to identify a selection request.  When a selection 
+ *			to identify a selection request.  When a selection
  *			request is received (i.e., when the specified mouse
  *			event occurs) the data  returned will be either the
  *			data associated with the particular selection active
@@ -59,11 +59,11 @@ XMenuPost(display, menu, p_num, s_num, x_pos, y_pos, event_mask)
      * Make the procedure call.
      */
     stat = XMenuActivate(
-			 display, 
+			 display,
 			 menu,
-			 p_num, s_num, 
-			 x_pos, y_pos, 
-			 event_mask, 
+			 p_num, s_num,
+			 x_pos, y_pos,
+			 event_mask,
 			 &data, 0);
 
     /*
diff --git a/oldXMenu/README b/oldXMenu/README
index 79b4250633d..4d6619b77ae 100644
--- a/oldXMenu/README
+++ b/oldXMenu/README
@@ -1,6 +1,6 @@
 This directory contains the source code for the X11R2 XMenu library.
 
 As of Release 2 of the X Window System, Version 11 from MIT, the XMenu
-library no longer supported.  It is not used in any software supplied 
+library no longer supported.  It is not used in any software supplied
 by MIT and its use is not encouraged.
 
diff --git a/oldXMenu/Recomp.c b/oldXMenu/Recomp.c
index c433cd550fd..933a6bf9f33 100644
--- a/oldXMenu/Recomp.c
+++ b/oldXMenu/Recomp.c
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/Recomp.c,v 1.1 1992/04/11 22:10:20 jimb Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/Recomp.c,v 1.1 1999/10/03 19:35:11 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -25,7 +25,7 @@ XMenuRecompute(display, menu)
 
     register int p_num;		/* Pane serial number. */
     register int s_num;		/* Selection serial number. */
-    
+
     /*
      * If there are no panes in the menu then return failure
      * because the menu is not initialized.
@@ -44,7 +44,7 @@ XMenuRecompute(display, menu)
     /*
      * For each pane in the menu...
      */
-        
+
     p_num = 0;
     for (
 	p_ptr = menu->p_list->next;
@@ -58,7 +58,7 @@ XMenuRecompute(display, menu)
 	    return(XM_FAILURE);
 	}
         p_num++;
-	
+
 	/*
 	 * For each selection in the pane...
 	 */
diff --git a/oldXMenu/SetSel.c b/oldXMenu/SetSel.c
index 0db2c8eb6bb..af812be31fe 100644
--- a/oldXMenu/SetSel.c
+++ b/oldXMenu/SetSel.c
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/SetSel.c,v 1.1 1992/04/11 22:10:21 jimb Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/SetSel.c,v 1.1 1999/10/03 19:35:15 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -24,7 +24,7 @@ XMenuSetSelection(menu, p_num, s_num, active)
 {
     register XMPane *p_ptr;	/* XMPane pointer. */
     register XMSelect *s_ptr;	/* XMSelect pointer. */
-    
+
     /*
      * Find the right pane.
      */
diff --git a/oldXMenu/X10.h b/oldXMenu/X10.h
index 4a983feac20..b6ba06e85da 100644
--- a/oldXMenu/X10.h
+++ b/oldXMenu/X10.h
@@ -1,14 +1,14 @@
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/X10.h,v 1.1 1992/04/11 22:10:21 jimb Exp $ */
-/* 
+/* $Header: /cvs/emacs/oldXMenu/X10.h,v 1.1 1999/10/03 19:35:16 fx Exp $ */
+/*
  * Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology
  *
  * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided 
- * that the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
  * documentation, and that the name of M.I.T. not be used in advertising
- * or publicity pertaining to distribution of the software without specific, 
- * written prior permission. M.I.T. makes no representations about the 
+ * or publicity pertaining to distribution of the software without specific,
+ * written prior permission. M.I.T. makes no representations about the
  * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
@@ -38,15 +38,15 @@ typedef struct {
 #define VertexCurved		0x0004		/* else straight */
 #define VertexStartClosed	0x0008		/* else not */
 #define VertexEndClosed		0x0010		/* else not */
-/*#define VertexDrawLastPoint	0x0020 	*/      /* else don't */	
+/*#define VertexDrawLastPoint	0x0020 	*/      /* else don't */
 
 /*
-The VertexDrawLastPoint option has not been implemented in XDraw and 
-XDrawFilled so it shouldn't be defined. 
+The VertexDrawLastPoint option has not been implemented in XDraw and
+XDrawFilled so it shouldn't be defined.
 */
 
 /*
- * XAssoc - Associations used in the XAssocTable data structure.  The 
+ * XAssoc - Associations used in the XAssocTable data structure.  The
  * associations are used as circular queue entries in the association table
  * which is contains an array of circular queues (buckets).
  */
@@ -58,11 +58,11 @@ typedef struct _XAssoc {
 	char *data;		/* Pointer to untyped memory. */
 } XAssoc;
 
-/* 
+/*
  * XAssocTable - X Window System id to data structure pointer association
  * table.  An XAssocTable is a hash table whose buckets are circular
  * queues of XAssoc's.  The XAssocTable is constructed from an array of
- * XAssoc's which are the circular queue headers (bucket headers).  
+ * XAssoc's which are the circular queue headers (bucket headers).
  * An XAssocTable consists an XAssoc pointer that points to the first
  * bucket in the bucket array and an integer that indicates the number
  * of buckets in the array.
diff --git a/oldXMenu/XCrAssoc.c b/oldXMenu/XCrAssoc.c
index 864ed9d4f1f..fae6defea05 100644
--- a/oldXMenu/XCrAssoc.c
+++ b/oldXMenu/XCrAssoc.c
@@ -37,14 +37,14 @@ XAssocTable *XCreateAssocTable(size)
 	register XAssocTable *table;	/* XAssocTable to be initialized. */
 	register XAssoc *buckets;	/* Pointer to the first bucket in */
 					/* the bucket array. */
-	
+
 	/* Malloc the XAssocTable. */
 	if ((table = (XAssocTable *)malloc(sizeof(XAssocTable))) == NULL) {
 		/* malloc call failed! */
 		errno = ENOMEM;
 		return(NULL);
 	}
-	
+
 	/* calloc the buckets (actually just their headers). */
 	buckets = (XAssoc *)calloc((unsigned)size, (unsigned)sizeof(XAssoc));
 	if (buckets == NULL) {
diff --git a/oldXMenu/XDestAssoc.c b/oldXMenu/XDestAssoc.c
index 452dd223bd8..d43b9c9576d 100644
--- a/oldXMenu/XDestAssoc.c
+++ b/oldXMenu/XDestAssoc.c
@@ -18,7 +18,7 @@ without express or implied warranty.
 
 /*
  * XDestroyAssocTable - Destroy (free the memory associated with)
- * an XAssocTable.  
+ * an XAssocTable.
  */
 XDestroyAssocTable(table)
 	register XAssocTable *table;
diff --git a/oldXMenu/XLookAssoc.c b/oldXMenu/XLookAssoc.c
index f80952a6345..b3a98ca2569 100644
--- a/oldXMenu/XLookAssoc.c
+++ b/oldXMenu/XLookAssoc.c
@@ -21,7 +21,7 @@ without express or implied warranty.
 #define NULL 0
 #endif
 
-/* 
+/*
  * XLookUpAssoc - Retrieve the data stored in an XAssocTable by its XId.
  * If an appropriately matching XId can be found in the table the routine will
  * return apointer to the data associated with it. If the XId can not be found
diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c
index d4682700ed2..f6ce766a9a0 100644
--- a/oldXMenu/XMakeAssoc.c
+++ b/oldXMenu/XMakeAssoc.c
@@ -47,7 +47,7 @@ XMakeAssoc(dpy, table, x_id, data)
 	register XAssoc *bucket;
 	register XAssoc *Entry;
 	register XAssoc *new_entry;
-	
+
 	/* Hash the XId to get the bucket number. */
 	hash = x_id & (table->size - 1);
 	/* Look up the bucket to get the entries in that bucket. */
diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h
index b94c01548cd..3188f66fa4c 100644
--- a/oldXMenu/XMenu.h
+++ b/oldXMenu/XMenu.h
@@ -1,6 +1,6 @@
 #include "copyright.h"
 
-/* $Header: /gd/gnu/cvsroot/emacs/oldXMenu/XMenu.h,v 1.1 1999/10/03 19:35:23 fx Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/XMenu.h,v 1.2 2000/01/27 15:29:38 gerd Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -8,7 +8,7 @@
  *
  *	XMenu.h -	Include file for the MIT Project Athena
  *			XMenu X window system menu package.
- *			
+ *
  *	Author:		Tony Della Fera, DEC
  *			August, 1984
  */
@@ -169,8 +169,8 @@ typedef enum _xmmode {
 } XMMode;
 
 
-/* 
- * Define the XMenu datatype. 
+/*
+ * Define the XMenu datatype.
  *
  * All dimensions are in pixels unless otherwise noted.
  */
@@ -216,7 +216,7 @@ typedef struct _xmenu {
     int s_y_off;		/* Selection window Y offset. */
     int s_count;		/* Maximum number of selections per pane. */
     GC normal_select_GC;	/* GC used for inactive selections. */
-    GC inverse_select_GC;	/* GC used for active (current) selection. */  
+    GC inverse_select_GC;	/* GC used for active (current) selection. */
     GC inact_GC;		/* GC used for inactive selections and */
 				/* panes headers. */
     /* -------------------- Color data -------------------- */
diff --git a/oldXMenu/XMenuInt.h b/oldXMenu/XMenuInt.h
index 7f3f013509a..3929f20bc79 100644
--- a/oldXMenu/XMenuInt.h
+++ b/oldXMenu/XMenuInt.h
@@ -1,5 +1,5 @@
 
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/XMenuInt.h,v 1.3 1992/10/10 16:05:10 jimb Exp $ */
+/* $Header: /cvs/emacs/oldXMenu/XMenuInt.h,v 1.1 1999/10/03 19:35:24 fx Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 /*
@@ -8,7 +8,7 @@
  *	XMenuInternal.h - Internal menu system include file for the
  *			MIT Project Athena XMenu X window system
  *			menu package.
- *			
+ *
  *	Author:		Tony Della Fera, DEC
  *			October, 1985
  */
diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c
index 4d264434d26..e15db5d6566 100644
--- a/oldXMenu/insque.c
+++ b/oldXMenu/insque.c
@@ -13,7 +13,7 @@ struct qelem {
 /* Insert ELEM into a doubly-linked list, after PREV.  */
 
 void
-emacs_insque (elem, prev) 
+emacs_insque (elem, prev)
      struct qelem *elem, *prev;
 {
   struct qelem *next = prev->q_forw;