Merge remote-tracking branch 'origin/released'

Conflicts:
	libfontenc/src/fontenc.c

38 files changed, 182 insertions, 182 deletions

diff --git a/libXmu/src/AllCmap.c b/libXmu/src/AllCmap.c
index 1daa8de7c..a974ce08f 100644
--- a/libXmu/src/AllCmap.c
+++ b/libXmu/src/AllCmap.c
@@ -1,5 +1,5 @@
-/* 
- 
+/*
+
 Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 #include <X11/Xmu/StdCmap.h>
- 
+
 static XVisualInfo *getDeepestVisual(int, XVisualInfo*, int);
 
 /*
@@ -41,7 +41,7 @@ static XVisualInfo *getDeepestVisual(int, XVisualInfo*, int);
  *
  * Define and retain as permanent resources all standard colormaps which are
  * meaningful for the visuals of each screen of the display.  Return 0 on
- * failure, non-zero on success.  If the property of any standard colormap 
+ * failure, non-zero on success.  If the property of any standard colormap
  * is already defined, redefine it.
  *
  * This interface is intended to be used by window managers or a client
@@ -51,7 +51,7 @@ static XVisualInfo *getDeepestVisual(int, XVisualInfo*, int);
  * with the screen's root window.  Each screen has exactly one root window.
  * The property names of standard colormaps are predefined, and each property
  * name may describe at most one colormap.
- * 
+ *
  * The standard colormaps are
  *		RGB_BEST_MAP
  *		RGB_RED_MAP
@@ -71,8 +71,8 @@ static XVisualInfo *getDeepestVisual(int, XVisualInfo*, int);
  * how the standard colormap is defined.  Because a standard colormap is
  * associated with a specific visual, there must be a method of determining
  * which visuals take precedence in defining standard colormaps.
- * 
- * The method used here is: for the visual of greatest depth, define all 
+ *
+ * The method used here is: for the visual of greatest depth, define all
  * standard colormaps meaningful to that visual class, according to this
  * order of (descending) precedence:
  *	1. DirectColor
@@ -124,9 +124,9 @@ XmuAllStandardColormaps(Display *dpy)
 		NULL))
 		status = XmuVisualStandardColormaps(dpy, scr, v1->visualid,
 						   (unsigned) v1->depth, 1, 1);
-	    if (status && 
+	    if (status &&
 	       (((v1 = getDeepestVisual(GrayScale, vinfo, nvisuals)) != NULL)
-		|| ((v1 = getDeepestVisual(StaticGray, vinfo, nvisuals)) != 
+		|| ((v1 = getDeepestVisual(StaticGray, vinfo, nvisuals)) !=
 		    NULL)))
 		status = XmuVisualStandardColormaps(dpy, scr, v1->visualid,
 						   (unsigned) v1->depth, 1, 1);
@@ -143,7 +143,7 @@ getDeepestVisual(int visual_class, XVisualInfo *vinfo, int nvisuals)
     register int	i;
     register int	maxdepth = 0;
     XVisualInfo		*v = NULL;
-    
+
     for (i=0; i < nvisuals; i++, vinfo++)
 	if (vinfo->class == visual_class && vinfo->depth > maxdepth)
 	{
diff --git a/libXmu/src/Atoms.c b/libXmu/src/Atoms.c
index 48e243194..412f399e7 100644
--- a/libXmu/src/Atoms.c
+++ b/libXmu/src/Atoms.c
@@ -1,4 +1,4 @@
-/* 
+/*
 
 Copyright 1988, 1998  The Open Group
 
diff --git a/libXmu/src/ClientWin.c b/libXmu/src/ClientWin.c
index 3af323e0a..38ade28a5 100644
--- a/libXmu/src/ClientWin.c
+++ b/libXmu/src/ClientWin.c
@@ -1,5 +1,5 @@
-/* 
- 
+/*
+
 Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/libXmu/src/Clip.c b/libXmu/src/Clip.c
index ff87a80c0..232e4c569 100644
--- a/libXmu/src/Clip.c
+++ b/libXmu/src/Clip.c
@@ -444,7 +444,7 @@ XmuAreaAnd(XmuArea *dst, XmuArea *src)
 	  Z = Z->next;
 	  if (Z->y >= p->y)
 	    {
-	      XmuScanline *q = XmuNewScanline(Z->y, 0, 0); 
+	      XmuScanline *q = XmuNewScanline(Z->y, 0, 0);
 	      XmuScanlineCopy(q, Z);
 
 	      XmuScanlineAnd(q, top);
diff --git a/libXmu/src/CloseHook.c b/libXmu/src/CloseHook.c
index ca9d9def6..01a1beb4b 100644
--- a/libXmu/src/CloseHook.c
+++ b/libXmu/src/CloseHook.c
@@ -1,4 +1,4 @@
-/* 
+/*
 Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -28,27 +28,27 @@ in this Software without prior written authorization from The Open Group.
  *
  * *
  * Author:  Jim Fulton, MIT X Consortium
- * 
- * 
+ *
+ *
  *			      Public Entry Points
- * 
+ *
  * CloseHook XmuAddCloseDisplayHook (dpy, func, arg)
  *     Display *dpy;
  *     XmuCloseHookProc func;
  *     XPointer arg;
- * 
+ *
  * Bool XmuRemoveCloseDisplayHook (dpy, hook, func, arg)
  *     Display *dpy;
  *     CloseHook hook;
  *     XmuCloseHookProc func;
  *     XPointer arg;
- * 
+ *
  * Bool XmuLookupCloseDisplayHook (dpy, hook, func, arg)
  *     Display *dpy;
  *     CloseHook hook;
  *     XmuCloseHookProc func;
  *     XPointer arg;
- * 
+ *
  */
 
 #ifdef HAVE_CONFIG_H
@@ -188,8 +188,8 @@ XmuRemoveCloseDisplayHook(Display *dpy, CloseHook handle,
 
 
 /*
- * Lookup - see whether or not a handle has been installed.  If handle is 
- * non-NULL, look for an entry that matches it; otherwise look for an entry 
+ * Lookup - see whether or not a handle has been installed.  If handle is
+ * non-NULL, look for an entry that matches it; otherwise look for an entry
  * with the same function/argument pair.
  */
 Bool
diff --git a/libXmu/src/CmapAlloc.c b/libXmu/src/CmapAlloc.c
index 3877512e0..96ec3cf0b 100644
--- a/libXmu/src/CmapAlloc.c
+++ b/libXmu/src/CmapAlloc.c
@@ -1,4 +1,4 @@
-/* 
+/*
 
 Copyright 1989, 1994, 1998  The Open Group
 
@@ -52,11 +52,11 @@ static int icbrt(int);
 static int icbrt_with_bits(int, int);
 static int icbrt_with_guess(int, int);
 
-/* To determine the best allocation of reds, greens, and blues in a 
+/* To determine the best allocation of reds, greens, and blues in a
  * standard colormap, use XmuGetColormapAllocation.
  * 	vinfo		specifies visual information for a chosen visual
  *	property	specifies one of the standard colormap property names
- * 	red_max		returns maximum red value 
+ * 	red_max		returns maximum red value
  *      green_max	returns maximum green value
  * 	blue_max	returns maximum blue value
  *
@@ -115,15 +115,15 @@ gray_allocation(int n, unsigned long *red_max, unsigned long *green_max,
 		unsigned long *blue_max)
 {
     *red_max = (n * 30) / 100;
-    *green_max = (n * 59) / 100; 
-    *blue_max = (n * 11) / 100; 
+    *green_max = (n * 59) / 100;
+    *blue_max = (n * 11) / 100;
     *green_max += ((n - 1) - (*red_max + *green_max + *blue_max));
 }
 
 /****************************************************************************/
 /* Determine an appropriate color allocation for the RGB_DEFAULT_MAP.
  * If a map has less than a minimum number of definable entries, we do not
- * produce an allocation for an RGB_DEFAULT_MAP.  
+ * produce an allocation for an RGB_DEFAULT_MAP.
  *
  * For 16 planes, the default colormap will have 27 each RGB; for 12 planes,
  * 12 each.  For 8 planes, let n = the number of colormap entries, which may
@@ -183,7 +183,7 @@ default_allocation(XVisualInfo *vinfo, unsigned long *red,
 	    ngrays = 12;
 	gray_allocation(ngrays, red, green, blue);
 	break;
-	
+
       default:
 	return 0;
     }
@@ -207,7 +207,7 @@ default_allocation(XVisualInfo *vinfo, unsigned long *red,
  * Which, on a GPX, allows for 252 entries in the best map, out of 254
  * defineable colormap entries.
  */
- 
+
 static void
 best_allocation(XVisualInfo *vinfo, unsigned long *red, unsigned long *green,
 		unsigned long *blue)
@@ -228,7 +228,7 @@ best_allocation(XVisualInfo *vinfo, unsigned long *red, unsigned long *green,
     else
     {
 	register int bits, n;
-	
+
 	/* Determine n such that n is the least integral power of 2 which is
 	 * greater than or equal to the number of entries in the colormap.
          */
@@ -239,11 +239,11 @@ best_allocation(XVisualInfo *vinfo, unsigned long *red, unsigned long *green,
 	    n = n << 1;
 	    bits++;
 	}
-	
+
 	/* If the number of entries in the colormap is a power of 2, determine
 	 * the allocation by "dealing" the bits, first to green, then red, then
 	 * blue.  If not, find the maximum integral red, green, and blue values
-	 * which, when multiplied together, do not exceed the number of 
+	 * which, when multiplied together, do not exceed the number of
 
 	 * colormap entries.
 	 */
@@ -260,7 +260,7 @@ best_allocation(XVisualInfo *vinfo, unsigned long *red, unsigned long *green,
 	else
 	{
 	    *red = icbrt_with_bits(vinfo->colormap_size, bits);
-	    *blue = *red;	
+	    *blue = *red;
 	    *green = (vinfo->colormap_size / ((*red) * (*blue)));
 	}
 	(*red)--;
diff --git a/libXmu/src/CrCmap.c b/libXmu/src/CrCmap.c
index 4343f5f0f..9cb5c81c0 100644
--- a/libXmu/src/CrCmap.c
+++ b/libXmu/src/CrCmap.c
@@ -1,4 +1,4 @@
-/* 
+/*
 
 Copyright 1989, 1998  The Open Group
 
@@ -84,7 +84,7 @@ static Status readwrite_map(Display*, XVisualInfo*, XStandardColormap*);
  *
  * All colormaps are created with read only allocations, with the exception
  * of read only allocations of colors in the default map or otherwise
- * which fail to return the expected pixel value, and these are individually 
+ * which fail to return the expected pixel value, and these are individually
  * defined as read/write allocations.  This is done so that all the cells
  * defined in the default map are contiguous, for use in image processing.
  * This typically happens with White and Black in the default map.
@@ -93,7 +93,7 @@ static Status readwrite_map(Display*, XVisualInfo*, XStandardColormap*);
  * the map of the static visual matches the definition given in the
  * standard colormap structure.
  */
-   
+
 Status
 XmuCreateColormap(Display *dpy, XStandardColormap *colormap)
      /* dpy	 - specifies the connection under which the map is created
@@ -107,15 +107,15 @@ XmuCreateColormap(Display *dpy, XStandardColormap *colormap)
     XVisualInfo		*vpointer;	/* for freeing the entire list */
     long		vinfo_mask;	/* specifies the visual mask value */
     int 		n;		/* number of matching visuals */
-    int			status;		
+    int			status;
 
     vinfo_template.visualid = colormap->visualid;
     vinfo_mask = VisualIDMask;
     if ((vinfo = XGetVisualInfo(dpy, vinfo_mask, &vinfo_template, &n)) == NULL)
 	return 0;
 
-    /* A visual id may be valid on multiple screens.  Also, there may 
-     * be multiple visuals with identical visual ids at different depths.  
+    /* A visual id may be valid on multiple screens.  Also, there may
+     * be multiple visuals with identical visual ids at different depths.
      * If the colormap is the Default Colormap, use the Default Visual.
      * Otherwise, arbitrarily, use the deepest visual.
      */
@@ -158,9 +158,9 @@ XmuCreateColormap(Display *dpy, XStandardColormap *colormap)
 	status = TRUEMATCH(red_mult, red_max, red_mask) &&
 	         TRUEMATCH(green_mult, green_max, green_mask) &&
 		 TRUEMATCH(blue_mult, blue_max, blue_mask);
-    else 
+    else
 	status = readonly_map(dpy, vinfo, colormap);
-    
+
     XFree((char *) vpointer);
     return status;
 }
@@ -178,7 +178,7 @@ readwrite_map(Display *dpy, XVisualInfo *vinfo, XStandardColormap *colormap)
     unsigned long	*pixels;	/* array of colormap pixels */
     unsigned long	delta;
 
-    
+
     /* Determine ncolors, the number of colors to be defined.
      * Insure that 1 < ncolors <= the colormap size.
      */
@@ -201,16 +201,16 @@ readwrite_map(Display *dpy, XVisualInfo *vinfo, XStandardColormap *colormap)
     if (ncolors <= 1 || (int) ncolors > vinfo->colormap_size)	return 0;
 
     /* Allocate Read/Write as much of the colormap as we can possibly get.
-     * Then insure that the pixels we were allocated are given in 
+     * Then insure that the pixels we were allocated are given in
      * monotonically increasing order, using a quicksort.  Next, insure
      * that our allocation includes a subset of contiguous pixels at least
-     * as long as the number of colors to be defined.  Now we know that 
+     * as long as the number of colors to be defined.  Now we know that
      * these conditions are met:
      *	1) There are no free cells in the colormap.
-     *  2) We have a contiguous sequence of pixels, monotonically 
+     *  2) We have a contiguous sequence of pixels, monotonically
      *     increasing, of length >= the number of colors requested.
      *
-     * One cell at a time, we will free, compute the next color value, 
+     * One cell at a time, we will free, compute the next color value,
      * then allocate read only.  This takes a long time.
      * This is done to insure that cells are allocated read only in the
      * contiguous order which we prefer.  If the server has a choice of
@@ -319,7 +319,7 @@ readwrite_map(Display *dpy, XVisualInfo *vinfo, XStandardColormap *colormap)
      */
 
     if (first_index)
-	XFreeColors(dpy, colormap->colormap, pixels, first_index, 
+	XFreeColors(dpy, colormap->colormap, pixels, first_index,
 		    (unsigned long) 0);
     if (remainder)
 	XFreeColors(dpy, colormap->colormap,
@@ -345,7 +345,7 @@ ROmap(Display *dpy, Colormap cmap, unsigned long pixels[], int m, int n)
     register int	p;
 
     /* first try to allocate the entire colormap */
-    if (XAllocColorCells(dpy, cmap, 1, (unsigned long *) NULL, 
+    if (XAllocColorCells(dpy, cmap, 1, (unsigned long *) NULL,
 			 (unsigned) 0, pixels, (unsigned) m))
 	return m;
 
@@ -369,7 +369,7 @@ ROmap(Display *dpy, Colormap cmap, unsigned long pixels[], int m, int n)
     }
     return 0;
 }
-      
+
 
 /****************************************************************************/
 static Status
@@ -424,20 +424,20 @@ ROorRWcell(Display *dpy, Colormap cmap, unsigned long pixels[],
      * If the read only allocation is granted, but gives us a cell which
      * is not the one that we just freed, it is probably the case that
      * we are trying allocate White or Black or some other color which
-     * already has a read-only allocation in the map.  So we try to 
+     * already has a read-only allocation in the map.  So we try to
      * allocate the previously freed cell with a read/write allocation,
      * because we want contiguous cells for image processing algorithms.
      */
-     
+
     pixel = color->pixel;
     request.red = color->red;
     request.green = color->green;
     request.blue = color->blue;
 
     XFreeColors(dpy, cmap, &pixel, 1, (unsigned long) 0);
-    if (! XAllocColor(dpy, cmap, color) 
+    if (! XAllocColor(dpy, cmap, color)
 	|| (color->pixel != pixel &&
-	    (!RWcell(dpy, cmap, color, &request, &pixel)))) 
+	    (!RWcell(dpy, cmap, color, &request, &pixel))))
     {
 	free_cells(dpy, cmap, pixels, npixels, (int)p);
 	return 0;
@@ -507,7 +507,7 @@ readonly_map(Display *dpy, XVisualInfo *vinfo, XStandardColormap *colormap)
     int			i, last_pixel;
     XColor		color;
 
-    last_pixel = (colormap->red_max + 1) * (colormap->green_max + 1) * 
+    last_pixel = (colormap->red_max + 1) * (colormap->green_max + 1) *
 	(colormap->blue_max + 1) + colormap->base_pixel - 1;
 
     for(i=colormap->base_pixel; i <= last_pixel; i++) {
diff --git a/libXmu/src/CursorName.c b/libXmu/src/CursorName.c
index 8867e8fa4..635ae51b2 100644
--- a/libXmu/src/CursorName.c
+++ b/libXmu/src/CursorName.c
@@ -1,5 +1,5 @@
 /*
- 
+
 Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -121,7 +121,7 @@ XmuCursorNameToIndex(_Xconst char *name)
     register _Xconst struct _CursorName *table;
     register int i;
     char tmp[40];
-    
+
     if (strlen (name) >= sizeof tmp) return -1;
     XmuCopyISOLatin1Lowered (tmp, name);
 
diff --git a/libXmu/src/CvtCache.c b/libXmu/src/CvtCache.c
index 39a5d0caf..921b51a1f 100644
--- a/libXmu/src/CvtCache.c
+++ b/libXmu/src/CvtCache.c
@@ -1,5 +1,5 @@
 /*
- 
+
 Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -24,7 +24,7 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/* 
+/*
  * Author:  Jim Fulton, MIT X Consortium
  */
 
@@ -100,7 +100,7 @@ _XmuCCLookupDisplay(Display *dpy)
 	dq = XmuDQCreate (_CloseDisplay, _FreeCCDQ, NULL);
 	if (!dq) return NULL;
     }
-    
+
     /*
      * See if the display is already there
      */
diff --git a/libXmu/src/CvtStdSel.c b/libXmu/src/CvtStdSel.c
index 81d1a8474..141dfe8df 100644
--- a/libXmu/src/CvtStdSel.c
+++ b/libXmu/src/CvtStdSel.c
@@ -1,5 +1,5 @@
 /*
- 
+
 Copyright 1988, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -110,7 +110,7 @@ get_os_name(void)
 #ifdef OS_NAME
 	return XtNewString(OS_NAME);
 #else
-#if defined(X_OS_FILE) || defined(MOTD_FILE)	
+#if defined(X_OS_FILE) || defined(MOTD_FILE)
 	FILE *f = NULL;
 #endif
 
diff --git a/libXmu/src/DefErrMsg.c b/libXmu/src/DefErrMsg.c
index 37fe0aa31..091d2c4aa 100644
--- a/libXmu/src/DefErrMsg.c
+++ b/libXmu/src/DefErrMsg.c
@@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xmu/SysUtil.h>
 
 /*
- * XmuPrintDefaultErrorMessage - print a nice error that looks like the usual 
+ * XmuPrintDefaultErrorMessage - print a nice error that looks like the usual
  * message.  Returns 1 if the caller should consider exitting else 0.
  */
 int
@@ -49,7 +49,7 @@ XmuPrintDefaultErrorMessage(Display *dpy, XErrorEvent *event, FILE *fp)
     XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
     XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
     (void) fprintf(fp, "%s:  %s\n  ", mesg, buffer);
-    XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", 
+    XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d",
 	mesg, BUFSIZ);
     (void) fprintf(fp, mesg, event->request_code);
     if (event->request_code < 128) {
@@ -84,7 +84,7 @@ XmuPrintDefaultErrorMessage(Display *dpy, XErrorEvent *event, FILE *fp)
 	/* kludge, try to find the extension that caused it */
 	buffer[0] = '\0';
 	for (ext = dpy->ext_procs; ext; ext = ext->next) {
-	    if (ext->error_string) 
+	    if (ext->error_string)
 		(*ext->error_string)(dpy, event->error_code, &ext->codes,
 				     buffer, BUFSIZ);
 	    if (buffer[0]) {
@@ -95,7 +95,7 @@ XmuPrintDefaultErrorMessage(Display *dpy, XErrorEvent *event, FILE *fp)
 		ext->codes.first_error < event->error_code &&
 		(!bext || ext->codes.first_error > bext->codes.first_error))
 		bext = ext;
-	}    
+	}
 	if (bext)
 	    XmuSnprintf(buffer, sizeof(buffer), "%s.%d", bext->name,
 			event->error_code - bext->codes.first_error);
@@ -134,7 +134,7 @@ XmuPrintDefaultErrorMessage(Display *dpy, XErrorEvent *event, FILE *fp)
 	(void) fprintf(fp, mesg, event->resourceid);
 	fputs("\n  ", fp);
     }
-    XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 
+    XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
 	mesg, BUFSIZ);
     (void) fprintf(fp, mesg, event->serial);
     fputs("\n  ", fp);
@@ -166,4 +166,4 @@ XmuSimpleErrorHandler(Display *dpy, XErrorEvent *errorp)
     }
     /* got a "real" X error */
     return XmuPrintDefaultErrorMessage (dpy, errorp, stderr);
-}	
+}
diff --git a/libXmu/src/DelCmap.c b/libXmu/src/DelCmap.c
index f29ae00f0..462c812b1 100644
--- a/libXmu/src/DelCmap.c
+++ b/libXmu/src/DelCmap.c
@@ -1,5 +1,5 @@
-/* 
- 
+/*
+
 Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/libXmu/src/DisplayQue.c b/libXmu/src/DisplayQue.c
index de76a69c4..7eea9f240 100644
--- a/libXmu/src/DisplayQue.c
+++ b/libXmu/src/DisplayQue.c
@@ -1,5 +1,5 @@
 /*
- 
+
 Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -65,7 +65,7 @@ XmuDQCreate(XmuCloseDisplayQueueProc closefunc,
 
 
 /*
- * XmuDQDestroy - free all storage associated with this display queue, 
+ * XmuDQDestroy - free all storage associated with this display queue,
  * optionally invoking the close callbacks.
  */
 
diff --git a/libXmu/src/DrawLogo.c b/libXmu/src/DrawLogo.c
index 4af89b530..21dbe3855 100644
--- a/libXmu/src/DrawLogo.c
+++ b/libXmu/src/DrawLogo.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlib.h>  
+#include <X11/Xlib.h>
 #include <X11/Xmu/Drawing.h>
 
 /*
@@ -57,10 +57,10 @@ XmuDrawLogo(Display *dpy, Drawable drawable, GC gcFore, GC gcBack,
     x += (width - size) >> 1;
     y += (height - size) >> 1;
 
-/*    
+/*
  * Draw what will be the thin strokes.
  *
- *           ----- 
+ *           -----
  *          /    /
  *         /    /
  *        /    /
@@ -81,10 +81,10 @@ XmuDrawLogo(Display *dpy, Drawable drawable, GC gcFore, GC gcBack,
     poly[3].x = x + d31;               poly[3].y = y + size;
     XFillPolygon(dpy, drawable, gcFore, poly, 4, Convex, CoordModeOrigin);
 
-/*    
+/*
  * Erase area not needed for lower thin stroke.
  *
- *           ------ 
+ *           ------
  *          /     /
  *         /  __ /
  *        /  /  /
@@ -98,10 +98,10 @@ XmuDrawLogo(Display *dpy, Drawable drawable, GC gcFore, GC gcBack,
     poly[3].x = x + d31;                         poly[3].y = y + size;
     XFillPolygon(dpy, drawable, gcBack, poly, 4, Convex, CoordModeOrigin);
 
-/*    
+/*
  * Erase area not needed for upper thin stroke.
  *
- *           ------ 
+ *           ------
  *          /  /  /
  *         /--/  /
  *        /     /
@@ -134,7 +134,7 @@ XmuDrawLogo(Display *dpy, Drawable drawable, GC gcFore, GC gcBack,
     poly[3].x = x + size - size/4;     poly[3].y = y + size;
     XFillPolygon(dpy, drawable, gcFore, poly, 4, Convex, CoordModeOrigin);
 
-/*    
+/*
  * Erase to create gap.
  *
  *          /
diff --git a/libXmu/src/ExtAgent.c b/libXmu/src/ExtAgent.c
index 6b0dfdbd8..16a709ba1 100644
--- a/libXmu/src/ExtAgent.c
+++ b/libXmu/src/ExtAgent.c
@@ -35,7 +35,7 @@ void
 XmuRegisterExternalAgent(Widget w, XtPointer data,
 			 XEvent *event, Boolean *cont)
 {
-/* 
+/*
 * This is a stub.  Writers of protocol libraries
 * that want to add protocol to Xaw, such as RAP, will reimplement this
 * procedure in their own libraries.
diff --git a/libXmu/src/FToCback.c b/libXmu/src/FToCback.c
index 4ca8d459a..07c00fe05 100644
--- a/libXmu/src/FToCback.c
+++ b/libXmu/src/FToCback.c
@@ -1,5 +1,5 @@
-/* 
- 
+/*
+
 Copyright 1988,1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/libXmu/src/GrayPixmap.c b/libXmu/src/GrayPixmap.c
index ccea46116..8005c3a0b 100644
--- a/libXmu/src/GrayPixmap.c
+++ b/libXmu/src/GrayPixmap.c
@@ -30,13 +30,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+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 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -99,7 +99,7 @@ XmuCreateStippledPixmap(Screen *screen, Pixel fore, Pixel back,
     }
 
     stippled_pixmap = XCreatePixmapFromBitmapData (display,
-			RootWindowOfScreen(screen), (char *)pixmap_bits, 
+			RootWindowOfScreen(screen), (char *)pixmap_bits,
 			pixmap_width, pixmap_height, fore, back, depth);
 
     /* and insert it at the head of the cache */
diff --git a/libXmu/src/Initer.c b/libXmu/src/Initer.c
index bd7678480..42b2cd6b3 100644
--- a/libXmu/src/Initer.c
+++ b/libXmu/src/Initer.c
@@ -1,5 +1,5 @@
-/* 
- 
+/*
+
 Copyright 1988, 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -40,12 +40,12 @@ struct InitializerList {
   XPointer data;		/* Data to pass the function. */
   XtAppContext * app_con_list;	/* a null terminated list of app_contexts. */
 };
-  
+
 /*
  * Prototypes
  */
 static Bool AddToAppconList(XtAppContext**, XtAppContext);
-  
+
 static struct InitializerList * init_list = NULL;
 static Cardinal init_list_length = 0;
 
@@ -53,8 +53,8 @@ void
 XmuAddInitializer(XmuInitializerProc func, XPointer data)
 {
   init_list_length++;
-  init_list = (struct InitializerList *) XtRealloc( (char *) init_list, 
-					    (sizeof(struct InitializerList) * 
+  init_list = (struct InitializerList *) XtRealloc( (char *) init_list,
+					    (sizeof(struct InitializerList) *
 					     init_list_length) );
 
   init_list[init_list_length - 1].function = func;
@@ -111,4 +111,4 @@ AddToAppconList(XtAppContext **app_list, XtAppContext app_con)
 
   return (True);
 }
-  
+
diff --git a/libXmu/src/LocBitmap.c b/libXmu/src/LocBitmap.c
index 0cfbdaa23..b587de7be 100644
--- a/libXmu/src/LocBitmap.c
+++ b/libXmu/src/LocBitmap.c
@@ -1,5 +1,5 @@
 /*
- 
+
 Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -75,10 +75,10 @@ static char **split_path_string(char*);
 
 Pixmap
 XmuLocateBitmapFile(Screen *screen, _Xconst char *name, char *srcname,
-			    int srcnamelen, int *widthp, int *heightp, 
+			    int srcnamelen, int *widthp, int *heightp,
 			    int *xhotp, int *yhotp)
 {
-    return XmuLocatePixmapFile (screen, name, 
+    return XmuLocatePixmapFile (screen, name,
 				(unsigned long) 1, (unsigned long) 0,
 				(unsigned int) 1, srcname, srcnamelen,
 				widthp, heightp, xhotp, yhotp);
@@ -89,9 +89,9 @@ XmuLocateBitmapFile(Screen *screen, _Xconst char *name, char *srcname,
  * version that reads pixmap data as well as bitmap data
  */
 Pixmap
-XmuLocatePixmapFile(Screen *screen, _Xconst char *name, 
-			    unsigned long fore, unsigned long back, 
-			    unsigned int depth, 
+XmuLocatePixmapFile(Screen *screen, _Xconst char *name,
+			    unsigned long fore, unsigned long back,
+			    unsigned int depth,
 			    char *srcname, int srcnamelen,
 			    int *widthp, int *heightp, int *xhotp, int *yhotp)
 {
@@ -131,10 +131,10 @@ XmuLocatePixmapFile(Screen *screen, _Xconst char *name,
 		/* what a hack; need to initialize it */
 		(void) XGetDefault (dpy, "", "");
 	    }
-	    if (XrmQGetResource (XrmGetDatabase(dpy), xrm_name, xrm_class, 
+	    if (XrmQGetResource (XrmGetDatabase(dpy), xrm_name, xrm_class,
 				 &rep_type, &value) &&
 		rep_type == XrmPermStringToQuark("String")) {
-		cache->string_to_bitmap.bitmapFilePath = 
+		cache->string_to_bitmap.bitmapFilePath =
 		  split_path_string (value.addr);
 	    }
 	}
@@ -262,7 +262,7 @@ void
 _XmuStringToBitmapFreeCache(register XmuCvtCache *c)
 {
     if (c->string_to_bitmap.bitmapFilePath) {
-	if (c->string_to_bitmap.bitmapFilePath[0]) 
+	if (c->string_to_bitmap.bitmapFilePath[0])
 	  free (c->string_to_bitmap.bitmapFilePath[0]);
 	free ((char *) (c->string_to_bitmap.bitmapFilePath));
     }
diff --git a/libXmu/src/Lookup.c b/libXmu/src/Lookup.c
index 75b546df4..023b33e47 100644
--- a/libXmu/src/Lookup.c
+++ b/libXmu/src/Lookup.c
@@ -1,5 +1,5 @@
-/* 
- 
+/*
+
 Copyright 1988, 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/libXmu/src/LookupCmap.c b/libXmu/src/LookupCmap.c
index 5756b83ec..4a522907e 100644
--- a/libXmu/src/LookupCmap.c
+++ b/libXmu/src/LookupCmap.c
@@ -1,5 +1,5 @@
-/* 
- 
+/*
+
 Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -45,7 +45,7 @@ static Status lookup(Display*, int, VisualID, Atom, XStandardColormap*, Bool);
 
 /*
  * To create a standard colormap if one does not currently exist, or
- * replace the currently existing standard colormap, use 
+ * replace the currently existing standard colormap, use
  * XmuLookupStandardColormap().
  *
  * Given a screen, a visual, and a property, XmuLookupStandardColormap()
@@ -54,14 +54,14 @@ static Status lookup(Display*, int, VisualID, Atom, XStandardColormap*, Bool);
  * the default colormap of the screen.  It will call XmuStandardColormap()
  * to create the standard colormap.
  *
- * If replace is true, any previous definition of the property will be 
+ * If replace is true, any previous definition of the property will be
  * replaced.  If retain is true, the property and the colormap will be
  * made permanent for the duration of the server session.  However,
  * pre-existing property definitions which are not replaced cannot be made
- * permanent by a call to XmuLookupStandardColormap(); a request to retain 
+ * permanent by a call to XmuLookupStandardColormap(); a request to retain
  * resources pertains to newly created resources.
  *
- * Returns 0 on failure, non-zero on success.  A request to create a 
+ * Returns 0 on failure, non-zero on success.  A request to create a
  * standard colormap upon a visual which cannot support such a map is
  * considered a failure.  An example of this would be requesting any
  * standard colormap property on a monochrome visual, or, requesting an
@@ -83,18 +83,18 @@ XmuLookupStandardColormap(Display *dpy, int screen, VisualID visualid,
       */
 {
     Display		*odpy;		/* original display connection */
-    XStandardColormap	*colormap;	
+    XStandardColormap	*colormap;
     XVisualInfo		vinfo_template, *vinfo;	/* visual */
     long		vinfo_mask;
     unsigned long	r_max, g_max, b_max;	/* allocation */
-    int			count;	
+    int			count;
     Colormap		cmap;			/* colormap ID */
     Status		status = 0;
 
 
     /* Match the requested visual */
 
-    vinfo_template.visualid = visualid;	
+    vinfo_template.visualid = visualid;
     vinfo_template.screen = screen;
     vinfo_template.depth = depth;
     vinfo_mask = VisualIDMask | VisualScreenMask | VisualDepthMask;
@@ -106,10 +106,10 @@ XmuLookupStandardColormap(Display *dpy, int screen, VisualID visualid,
 
     if (vinfo->colormap_size <= 2) {
 	XFree((char *) vinfo);
-	return 0;	
+	return 0;
     }
 
-    /* If the requested property already exists on this screen, and, 
+    /* If the requested property already exists on this screen, and,
      * if the replace flag has not been set to true, return success.
      * lookup() will remove a pre-existing map if replace is true.
      */
@@ -158,7 +158,7 @@ XmuLookupStandardColormap(Display *dpy, int screen, VisualID visualid,
 	    !replace) {
 	    /* Someone has defined the property since we last looked.
 	     * Since we will not replace it, release our own resources.
-	     * If this is the default map, our allocations will be freed 
+	     * If this is the default map, our allocations will be freed
 	     * when this connection closes.
 	     */
 	    if (colormap->killid == ReleaseByFreeingColormap)
@@ -190,7 +190,7 @@ XmuLookupStandardColormap(Display *dpy, int screen, VisualID visualid,
  *
  * If new is not NULL, new points to an XStandardColormap structure which
  * describes a standard colormap of the specified property.  It will be made
- * a standard colormap of the screen if none already exists, or if replace 
+ * a standard colormap of the screen if none already exists, or if replace
  * is true.
  */
 
@@ -232,7 +232,7 @@ lookup(Display *dpy, int screen, VisualID visualid, Atom property,
     }
 
     /* The property exists and is RGB_DEFAULT_MAP */
-    
+
     for (i=0, s=stdcmaps; (i < count) && (s->visualid != visualid); i++, s++)
 	;
 
@@ -278,9 +278,9 @@ lookup(Display *dpy, int screen, VisualID visualid, Atom property,
     /* Found an RGB_DEFAULT_MAP property with a matching visualid */
 
     if (replace) {
-	/* Free old resources first - we may need them, particularly in 
+	/* Free old resources first - we may need them, particularly in
 	 * the default colormap of the screen.  However, because of this,
-	 * it is possible that we will destroy the old resource and fail 
+	 * it is possible that we will destroy the old resource and fail
 	 * to create a new one if XmuStandardColormap() fails.
 	 */
 
diff --git a/libXmu/src/Lower.c b/libXmu/src/Lower.c
index 7522cc161..d3aaaf3ee 100644
--- a/libXmu/src/Lower.c
+++ b/libXmu/src/Lower.c
@@ -1,5 +1,5 @@
-/* 
- 
+/*
+
 Copyright 1988, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/libXmu/src/Makefile.am b/libXmu/src/Makefile.am
index ad5b55ddd..7e3185309 100644
--- a/libXmu/src/Makefile.am
+++ b/libXmu/src/Makefile.am
@@ -80,8 +80,8 @@ lintlibdir = $(libdir)
 lintlib_DATA = $(LINTLIB) $(LINTLIBUU)
 
 $(LINTLIB): $(libXmu_la_SOURCES)
-	$(LINT) -y -oXmu -x $(ALL_LINT_FLAGS) $(libXmu_la_SOURCES) 
+	$(LINT) -y -oXmu -x $(ALL_LINT_FLAGS) $(libXmu_la_SOURCES)
 
 $(LINTLIBUU): $(libXmuu_la_SOURCES)
-	$(LINT) -y -oXmuu -x $(ALL_LINT_FLAGS) $(libXmuu_la_SOURCES) 
+	$(LINT) -y -oXmuu -x $(ALL_LINT_FLAGS) $(libXmuu_la_SOURCES)
 endif MAKE_LINT_LIB
diff --git a/libXmu/src/RdBitF.c b/libXmu/src/RdBitF.c
index ece6d53ce..ea447c3c8 100644
--- a/libXmu/src/RdBitF.c
+++ b/libXmu/src/RdBitF.c
@@ -35,7 +35,7 @@ in this Software without prior written authorization from The Open Group.
  *					and return data
  *
  * Note that this file and ../X/XRdBitF.c look very similar....  Keep them
- * that way (but don't use common source code so that people can have one 
+ * that way (but don't use common source code so that people can have one
  * without the other).
  */
 
@@ -102,7 +102,7 @@ initHexTable(void)
     hexTable[' '] = -1;	hexTable[','] = -1;
     hexTable['}'] = -1;	hexTable['\n'] = -1;
     hexTable['\t'] = -1;
-	
+
     initialized = True;
 }
 
@@ -116,7 +116,7 @@ NextInt(FILE *fstream)
     int	value = 0;
     int gotone = 0;
     int done = 0;
-    
+
     /* loop, accumulate hex value until find delimiter  */
     /* skip any initial delimiters found in read stream */
 
@@ -196,7 +196,7 @@ XmuReadBitmapData(FILE *fstream, unsigned int *width, unsigned int *height,
 	    }
 	    continue;
 	}
-    
+
 	if (sscanf(line, "static short %s = {", name_and_type) == 1)
 	  version10p = 1;
 	else if (sscanf(line,"static unsigned char %s = {",name_and_type) == 1)
@@ -213,7 +213,7 @@ XmuReadBitmapData(FILE *fstream, unsigned int *width, unsigned int *height,
 
 	if (strcmp("bits[]", type))
 	  continue;
-    
+
 	if (!ww || !hh)
 	  RETURN (BitmapFileInvalid);
 
@@ -226,7 +226,7 @@ XmuReadBitmapData(FILE *fstream, unsigned int *width, unsigned int *height,
 
 	size = bytes_per_line * hh;
 	data = (unsigned char *) Xmalloc ((unsigned int) size);
-	if (!data) 
+	if (!data)
 	  RETURN (BitmapNoMemory);
 
 	if (version10p) {
@@ -245,7 +245,7 @@ XmuReadBitmapData(FILE *fstream, unsigned int *width, unsigned int *height,
 	    int bytes;
 
 	    for (bytes=0, ptr=data; bytes<size; bytes++, ptr++) {
-		if ((value = NextInt(fstream)) < 0) 
+		if ((value = NextInt(fstream)) < 0)
 		  RETURN (BitmapFileInvalid);
 		*ptr=value;
 	    }
@@ -319,7 +319,7 @@ AccessFile(_Xconst char *path, char *pathbuf, int len_pathbuf, char **pathret)
 	return 1;
     }
 
-#ifndef __UNIXOS2__ 
+#ifndef __UNIXOS2__
     /* one last place to look */
     drive = getenv ("HOMEDRIVE");
     if (drive) {
@@ -382,7 +382,7 @@ fopen_file(_Xconst char *path, char *mode)
 
 
 int
-XmuReadBitmapDataFromFile(_Xconst char *filename, unsigned int *width, 
+XmuReadBitmapDataFromFile(_Xconst char *filename, unsigned int *width,
 			       unsigned int *height, unsigned char **datap,
 			       int *x_hot, int *y_hot)
 {
diff --git a/libXmu/src/ShapeWidg.c b/libXmu/src/ShapeWidg.c
index bb8c4fbb3..32388ee46 100644
--- a/libXmu/src/ShapeWidg.c
+++ b/libXmu/src/ShapeWidg.c
@@ -1,5 +1,5 @@
-/* 
- 
+/*
+
 Copyright 1988, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -142,7 +142,7 @@ ShapeOval(Widget w)
 	rad = height >> 1;
 	XDrawLine(dpy, p, gc, rad, rad, width - rad - 1, rad);
     }
-    XShapeCombineMask(dpy, XtWindow(w), ShapeBounding, 
+    XShapeCombineMask(dpy, XtWindow(w), ShapeBounding,
 		      -(int)w->core.border_width, -(int)w->core.border_width,
 		      p, ShapeSet);
     if (w->core.border_width)
diff --git a/libXmu/src/StdCmap.c b/libXmu/src/StdCmap.c
index 5d2ce6160..ccc822e17 100644
--- a/libXmu/src/StdCmap.c
+++ b/libXmu/src/StdCmap.c
@@ -1,4 +1,4 @@
-/* 
+/*
 
 Copyright 1989, 1998  The Open Group
 
@@ -54,7 +54,7 @@ static Status valid_args(XVisualInfo*, unsigned long, unsigned long,
  * given standard property name.  Return a pointer to an XStandardColormap
  * structure which describes the newly created colormap, upon success.
  * Upon failure, return NULL.
- * 
+ *
  * XmuStandardColormap() calls XmuCreateColormap() to create the map.
  *
  * Resources created by this function are not made permanent; that is the
@@ -83,7 +83,7 @@ XmuStandardColormap(Display *dpy, int screen, VisualID visualid,
     int			n;
 
     /* Match the required visual information to an actual visual */
-    vinfo_template.visualid = visualid;	
+    vinfo_template.visualid = visualid;
     vinfo_template.screen = screen;
     vinfo_template.depth = depth;
     vinfo_mask = VisualIDMask | VisualScreenMask | VisualDepthMask;
@@ -120,7 +120,7 @@ XmuStandardColormap(Display *dpy, int screen, VisualID visualid,
     stdcmap->red_max = red_max;
     stdcmap->green_max = green_max;
     stdcmap->blue_max = blue_max;
-    if (property == XA_RGB_GRAY_MAP) 
+    if (property == XA_RGB_GRAY_MAP)
 	stdcmap->red_mult = stdcmap->green_mult = stdcmap->blue_mult = 1;
     else if (vinfo->class == TrueColor || vinfo->class == DirectColor) {
 	stdcmap->red_mult = lowbit(vinfo->red_mask);
@@ -149,7 +149,7 @@ XmuStandardColormap(Display *dpy, int screen, VisualID visualid,
 	    XFreeColormap(dpy, stdcmap->colormap);
 	else if (stdcmap->killid != None)
 	    XFreePixmap(dpy, stdcmap->killid);
-	
+
 	XFree((char *) stdcmap);
 	return (XStandardColormap *) NULL;
     }
@@ -197,7 +197,7 @@ valid_args(XVisualInfo *vinfo, unsigned long red_max, unsigned long green_max,
 	if (ncolors > vinfo->colormap_size)
 	    return 0;
     }
-    
+
     /* Determine that the allocation and visual make sense for the property */
 
     switch (property)
@@ -214,7 +214,7 @@ valid_args(XVisualInfo *vinfo, unsigned long red_max, unsigned long green_max,
 	if (green_max == 0)
 	    return 0;
 	break;
-      case XA_RGB_BLUE_MAP:	
+      case XA_RGB_BLUE_MAP:
 	if (blue_max == 0)
 	    return 0;
 	break;
diff --git a/libXmu/src/StrToBS.c b/libXmu/src/StrToBS.c
index 0dd0be519..c515109d2 100644
--- a/libXmu/src/StrToBS.c
+++ b/libXmu/src/StrToBS.c
@@ -1,5 +1,5 @@
-/* 
- 
+/*
+
 Copyright 1988, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/libXmu/src/StrToBmap.c b/libXmu/src/StrToBmap.c
index 80df74bc7..c2b49e3f4 100644
--- a/libXmu/src/StrToBmap.c
+++ b/libXmu/src/StrToBmap.c
@@ -30,13 +30,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+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 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -66,7 +66,7 @@ SOFTWARE.
  * BitmapFilePath.  If the resource is not defined, the default
  * value is the build symbol BITMAPDIR.
  *
- * shares lots of code with XmuConvertStringToCursor.  
+ * shares lots of code with XmuConvertStringToCursor.
  *
  * To use, include the following in your ClassInitialize procedure:
 
diff --git a/libXmu/src/StrToCurs.c b/libXmu/src/StrToCurs.c
index 5645f2ef9..714b004ee 100644
--- a/libXmu/src/StrToCurs.c
+++ b/libXmu/src/StrToCurs.c
@@ -30,13 +30,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+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 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -97,7 +97,7 @@ SOFTWARE.
  * XmuConvertStringToCursor:
  *
  * allows String to specify a standard cursor name (from cursorfont.h), a
- * font name and glyph index of the form "FONT fontname index [[font] index]", 
+ * font name and glyph index of the form "FONT fontname index [[font] index]",
  * or a bitmap file name (absolute, or relative to the global resource
  * bitmapFilePath, class BitmapFilePath).  If the resource is not
  * defined, the default value is the build symbol BITMAPDIR.
@@ -112,7 +112,7 @@ static XtConvertArgRec screenConvertArg[] = {
      sizeof(Screen *)}
 };
 
-    XtAddConverter(XtRString, XtRCursor, XmuCvtStringToCursor,      
+    XtAddConverter(XtRString, XtRCursor, XmuCvtStringToCursor,
 		   screenConvertArg, XtNumber(screenConvertArg));
  *
  */
@@ -251,7 +251,7 @@ XmuCvtStringToCursor(XrmValuePtr args, Cardinal *num_args,
 	return;
     }
 
-    if ((source = XmuLocateBitmapFile (screen, name, 
+    if ((source = XmuLocateBitmapFile (screen, name,
 				       maskname, (sizeof maskname) - 4,
 				       NULL, NULL, &xhot, &yhot)) == None) {
 	XtStringConversionWarning (name, XtRCursor);
@@ -262,7 +262,7 @@ XmuCvtStringToCursor(XrmValuePtr args, Cardinal *num_args,
     len = strlen (maskname);
     for (i = 0; i < 2; i++) {
 	strcpy (maskname + len, i == 0 ? "Mask" : "msk");
-	if ((mask = XmuLocateBitmapFile (screen, maskname, NULL, 0, 
+	if ((mask = XmuLocateBitmapFile (screen, maskname, NULL, 0,
 					 NULL, NULL, NULL, NULL)) != None)
 	  break;
     }
@@ -333,7 +333,7 @@ XmuCvtStringToColorCursor(Display *dpy, XrmValuePtr args, Cardinal *num_args,
 
     number = 1;
     XmuCvtStringToCursor(args, &number, fromVal, &ret_val);
-    
+
     cursor = *((Cursor *) ret_val.addr);
 
     if (cursor == None || (fg == BlackPixelOfScreen(screen)
@@ -348,5 +348,5 @@ XmuCvtStringToColorCursor(Display *dpy, XrmValuePtr args, Cardinal *num_args,
     new_done(Cursor, cursor);
 }
 
-    
-    
+
+
diff --git a/libXmu/src/StrToGrav.c b/libXmu/src/StrToGrav.c
index 8d86fe51d..44cc13bb0 100644
--- a/libXmu/src/StrToGrav.c
+++ b/libXmu/src/StrToGrav.c
@@ -1,4 +1,4 @@
-/* 
+/*
 
 Copyright 1989, 1998  The Open Group
 
@@ -62,7 +62,7 @@ static struct _namepair {
 };
 
 /*
- * This function is deprecated as of the addition of 
+ * This function is deprecated as of the addition of
  * XtCvtStringToGravity in R6
  */
 void
diff --git a/libXmu/src/StrToJust.c b/libXmu/src/StrToJust.c
index 03b38545d..234f3a37f 100644
--- a/libXmu/src/StrToJust.c
+++ b/libXmu/src/StrToJust.c
@@ -1,5 +1,5 @@
-/* 
- 
+/*
+
 Copyright 1988, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/libXmu/src/StrToLong.c b/libXmu/src/StrToLong.c
index c0663f5ce..8ee2ee4e4 100644
--- a/libXmu/src/StrToLong.c
+++ b/libXmu/src/StrToLong.c
@@ -1,5 +1,5 @@
 /*
- 
+
 Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/libXmu/src/StrToOrnt.c b/libXmu/src/StrToOrnt.c
index 0c41c116c..5d54b1acc 100644
--- a/libXmu/src/StrToOrnt.c
+++ b/libXmu/src/StrToOrnt.c
@@ -1,5 +1,5 @@
-/* 
- 
+/*
+
 Copyright 1988, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/libXmu/src/StrToShap.c b/libXmu/src/StrToShap.c
index 298c91522..0773404a1 100644
--- a/libXmu/src/StrToShap.c
+++ b/libXmu/src/StrToShap.c
@@ -1,5 +1,5 @@
-/* 
- 
+/*
+
 Copyright 1988, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/libXmu/src/UpdMapHint.c b/libXmu/src/UpdMapHint.c
index 389b80213..d68ee609b 100644
--- a/libXmu/src/UpdMapHint.c
+++ b/libXmu/src/UpdMapHint.c
@@ -56,4 +56,4 @@ XmuUpdateMapHints(Display *dpy, Window w, XSizeHints *hints)
     XSetWMNormalHints (dpy, w, hints);
     return True;
 }
-    
+
diff --git a/libXmu/src/VisCmap.c b/libXmu/src/VisCmap.c
index 0a35713ba..c3198de38 100644
--- a/libXmu/src/VisCmap.c
+++ b/libXmu/src/VisCmap.c
@@ -1,4 +1,4 @@
-/* 
+/*
 
 Copyright 1989, 1998  The Open Group
 
@@ -41,7 +41,7 @@ in this Software without prior written authorization from The Open Group.
 /*
  * To create all of the appropriate standard colormaps for a given visual on
  * a given screen, use XmuVisualStandardColormaps.
- * 
+ *
  * Define all appropriate standard colormap properties for the given visual.
  * If replace is true, any previous definition will be removed.
  * If retain is true, new properties will be retained for the duration of
@@ -147,7 +147,7 @@ XmuVisualStandardColormaps(Display *dpy, int screen, VisualID visualid,
 
 	status = XmuLookupStandardColormap(dpy, screen, visualid, depth,
 					   XA_RGB_BEST_MAP, replace, retain);
-	if (!status && (vinfo->class == PseudoColor || 
+	if (!status && (vinfo->class == PseudoColor ||
 			vinfo->class == DirectColor)) {
 	    XmuDeleteStandardColormap(dpy, screen, XA_RGB_DEFAULT_MAP);
 	    XmuDeleteStandardColormap(dpy, screen, XA_RGB_GRAY_MAP);
diff --git a/libXmu/src/WidgetNode.c b/libXmu/src/WidgetNode.c
index 8ce169eb5..0cf0bb6c9 100644
--- a/libXmu/src/WidgetNode.c
+++ b/libXmu/src/WidgetNode.c
@@ -1,5 +1,5 @@
 /*
- 
+
 Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -101,7 +101,7 @@ find_resource(XmuWidgetNode *node, char *name, Bool cons)
 #define nreslist (int) (cons ? sup->nconstraints : sup->nresources)
 
     res.resource_name = name;
-    for (sup = node->superclass; 
+    for (sup = node->superclass;
 	 sup && (XtResourceList) binsearch ((char *) &res,
 					    reslist, nreslist,
 					    sizeof(XtResource),
@@ -195,7 +195,7 @@ XmuWnInitializeNodes(XmuWidgetNode *nodearray, int nnodes)
 	     */
 	    superclass = superclass->core_class.superclass;
 	}
-      done: 
+      done:
 	if (wn->superclass) {
 	    wn->siblings = wn->superclass->children;
 	    wn->superclass->children = wn;
diff --git a/libXmu/src/Xct.c b/libXmu/src/Xct.c
index 1db470ebb..9ff8d3cb0 100644
--- a/libXmu/src/Xct.c
+++ b/libXmu/src/Xct.c
@@ -1,4 +1,4 @@
-/* 
+/*
 
 Copyright 1989, 1998  The Open Group
 
@@ -334,7 +334,7 @@ ShiftGRToGL(register XctData data, int hasCdata)
 	else
 	    priv->itembuf = (XctString)malloc(priv->buf_count);
     }
-    (void) memmove((char *)priv->itembuf, (char *)data->item, 
+    (void) memmove((char *)priv->itembuf, (char *)data->item,
 		   data->item_length);
     data->item = priv->itembuf;
     if (hasCdata) {