Merge remote-tracking branch 'origin/released'

Conflicts:
	libfontenc/src/fontenc.c

16 files changed, 58 insertions, 58 deletions

diff --git a/libXmu/include/X11/Xmu/Atoms.h b/libXmu/include/X11/Xmu/Atoms.h
index 3d8691025..fc59b3180 100644
--- a/libXmu/include/X11/Xmu/Atoms.h
+++ b/libXmu/include/X11/Xmu/Atoms.h
@@ -1,4 +1,4 @@
-/* 
+/*
 
 Copyright 1988, 1998  The Open Group
 
diff --git a/libXmu/include/X11/Xmu/CharSet.h b/libXmu/include/X11/Xmu/CharSet.h
index 1ce9166a0..9d9e53a8f 100644
--- a/libXmu/include/X11/Xmu/CharSet.h
+++ b/libXmu/include/X11/Xmu/CharSet.h
@@ -1,4 +1,4 @@
-/* 
+/*
 
 Copyright 1988, 1998  The Open Group
 
diff --git a/libXmu/include/X11/Xmu/CloseHook.h b/libXmu/include/X11/Xmu/CloseHook.h
index 2481ebf3e..1b895a96e 100644
--- a/libXmu/include/X11/Xmu/CloseHook.h
+++ b/libXmu/include/X11/Xmu/CloseHook.h
@@ -1,4 +1,4 @@
-/* 
+/*
 
 Copyright 1988, 1998  The Open Group
 
diff --git a/libXmu/include/X11/Xmu/Converters.h b/libXmu/include/X11/Xmu/Converters.h
index 3779750c6..19ece564c 100644
--- a/libXmu/include/X11/Xmu/Converters.h
+++ b/libXmu/include/X11/Xmu/Converters.h
@@ -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/include/X11/Xmu/CurUtil.h b/libXmu/include/X11/Xmu/CurUtil.h
index 3524d7704..ab577a252 100644
--- a/libXmu/include/X11/Xmu/CurUtil.h
+++ b/libXmu/include/X11/Xmu/CurUtil.h
@@ -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/include/X11/Xmu/CvtCache.h b/libXmu/include/X11/Xmu/CvtCache.h
index 7441e2f2e..714a4984e 100644
--- a/libXmu/include/X11/Xmu/CvtCache.h
+++ b/libXmu/include/X11/Xmu/CvtCache.h
@@ -1,5 +1,5 @@
 /*
- 
+
 Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
 
 /*
  *			       Public Interfaces
- * 
+ *
  * XmuCvtCache *XmuCvtCacheLookupDisplay (dpy)
  *     Display *dpy;
  */
diff --git a/libXmu/include/X11/Xmu/DisplayQue.h b/libXmu/include/X11/Xmu/DisplayQue.h
index b37a58133..ffc82a2c0 100644
--- a/libXmu/include/X11/Xmu/DisplayQue.h
+++ b/libXmu/include/X11/Xmu/DisplayQue.h
@@ -32,13 +32,13 @@ in this Software without prior written authorization from The Open Group.
 
 /*
  *			      Public Entry Points
- * 
- * 
+ *
+ *
  * XmuDisplayQueue *XmuDQCreate (closefunc, freefunc, data)
  *     XmuCloseDisplayQueueProc closefunc;
  *     XmuFreeDisplayQueueProc freefunc;
  *     XPointer data;
- * 
+ *
  *         Creates and returns a queue into which displays may be placed.  When
  *         the display is closed, the closefunc (if non-NULL) is upcalled with
  *         as follows:
@@ -53,12 +53,12 @@ in this Software without prior written authorization from The Open Group.
  * Bool XmuDQDestroy (q, docallbacks)
  *     XmuDisplayQueue *q;
  *     Bool docallbacks;
- * 
+ *
  *         Releases all memory for the indicated display queue.  If docallbacks
- *         is true, then the closefunc (if non-NULL) is called for each 
+ *         is true, then the closefunc (if non-NULL) is called for each
  *         display.
- * 
- * 
+ *
+ *
  * XmuDisplayQueueEntry *XmuDQLookupDisplay (q, dpy)
  *     XmuDisplayQueue *q;
  *     Display *dpy;
@@ -66,7 +66,7 @@ in this Software without prior written authorization from The Open Group.
  *         Returns the queue entry for the specified display or NULL if the
  *         display is not in the queue.
  *
- * 
+ *
  * XmuDisplayQueueEntry *XmuDQAddDisplay (q, dpy, data)
  *     XmuDisplayQueue *q;
  *     Display *dpy;
@@ -77,13 +77,13 @@ in this Software without prior written authorization from The Open Group.
  *         caller to attach arbitrary data to this display in this queue.  The
  *         caller should use XmuDQLookupDisplay to make sure that the display
  *         hasn't already been added.
- * 
- * 
+ *
+ *
  * Bool XmuDQRemoveDisplay (q, dpy)
  *     XmuDisplayQueue *q;
  *     Display *dpy;
  *
- *         Removes the specified display from the given queue.  If the 
+ *         Removes the specified display from the given queue.  If the
  *         indicated display is not found on this queue, False is returned,
  *         otherwise True is returned.
  */
diff --git a/libXmu/include/X11/Xmu/Drawing.h b/libXmu/include/X11/Xmu/Drawing.h
index 91d764b77..717292aec 100644
--- a/libXmu/include/X11/Xmu/Drawing.h
+++ b/libXmu/include/X11/Xmu/Drawing.h
@@ -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/include/X11/Xmu/EditresP.h b/libXmu/include/X11/Xmu/EditresP.h
index 6f7c739ab..61ec51dbe 100644
--- a/libXmu/include/X11/Xmu/EditresP.h
+++ b/libXmu/include/X11/Xmu/EditresP.h
@@ -55,22 +55,22 @@ in this Software without prior written authorization from The Open Group.
 	Window:		32-bit value
 	Widget:		32-bit value
 	String8:        ListOfCard8
-	
+
 	[a][b][c] represent an exclusive list of choices.
 
-	All widgets are passed as a list of widgets, containing the 
+	All widgets are passed as a list of widgets, containing the
 	full instance heirarch of this widget.  The hierarchy is ordered
 	from parent to child.  Thus the first element of each list is
 	the root of the widget tree (this makes verifying that the widget
 	still exists, MUCH faster).
 
 	ListOfFoo comprises a list of things in the following format:
-	
+
 	number:			Card16
 	<number> things:	????
-	
+
   This is a synchronous protocol, every request MUST be followed by a
-  reply.  
+  reply.
 
   Request:
 
@@ -82,7 +82,7 @@ in this Software without prior written authorization from The Open Group.
 				  FindChild = 4,
 				  GetValues = 5 }
 	Length:		Card32
-	Data:		
+	Data:
 
    Reply:
 
@@ -132,7 +132,7 @@ in this Software without prior written authorization from The Open Group.
         of widgets for each widget in the tree.  This is enough information
         to completely reconstruct the entire widget heirarchy.
 
-	The window return value contains the Xid of the window currently 
+	The window return value contains the Xid of the window currently
 	used by this widget.  If the widget is unrealized then 0 is returned,
 	and if widget is a non-windowed object a value of 2 is returned.
 
@@ -152,20 +152,20 @@ in this Software without prior written authorization from The Open Group.
 		widget:		ListOfWidgets
 		message:	String8
 
-	SetValues will allow the same resource to be set on a number of 
+	SetValues will allow the same resource to be set on a number of
 	widgets.  This function will return an error message if the SetValues
 	request caused an Xt error.
-	
+
   GetValues:
 
-        names:                ListOfString8       
+        names:                ListOfString8
         widget:               Widget
 
         --->
 	novalues:             ListOfCard16
 	values:               ListOfString8
-                   
-        GetValues will allow a number of resource values to be read 
+
+        GetValues will allow a number of resource values to be read
         on a particular widget.  The request specifies the names of
 	the resources wanted and the widget id these resources are
 	from.  The reply returns a list of indices from the requests
@@ -191,10 +191,10 @@ in this Software without prior written authorization from The Open Group.
 		Resource:
 			Kind:	{normal, constraint}
 			Name:	String8
-			Class:	String8	
+			Class:	String8
 			Type:	String8 ]
 
-	GetResource retrieves the kind, name, class and type for every 
+	GetResource retrieves the kind, name, class and type for every
 	widget passed to it.  If an error occured with the resource fetch
 	Error will be set to True for the given widget and a message
 	is returned rather than the resource info.
@@ -221,23 +221,23 @@ in this Software without prior written authorization from The Open Group.
 		  BorderWidth:	Card16 ]
 
 	GetGeometry retreives the mapping state, x, y, width, height
-	and border width for each widget specified.  If an error occured 
-	with the geometry fetch "Error" will be set to True for the given 
-	widget and a message is returned rather than the geometry info.  
+	and border width for each widget specified.  If an error occured
+	with the geometry fetch "Error" will be set to True for the given
+	widget and a message is returned rather than the geometry info.
 	X an Y corrospond to the root coordinates of the upper left corner
 	of the widget (outside the window border).
-	
+
   FindChild:
 
 	Widget:		ListOfWidgets
 	X:		Int16
 	Y:		Int16
-	
+
 	--->
 
 	Widget:		ListOfWidgets
 
-	Find Child returns a descendent of the widget specified that 
+	Find Child returns a descendent of the widget specified that
 	is at the root coordinates specified.
 
 	NOTE:
@@ -247,20 +247,20 @@ in this Software without prior written authorization from The Open Group.
 
   GetValues:
 
-        names:                ListOfString8       
+        names:                ListOfString8
         widget:               Widget
 
         --->
-	
+
 	values:               ListOfString8
 
-        GetValues will allow a number of resource values to be read 
-        on a particular widget.  Currently only InterViews 3.0.1 Styles 
+        GetValues will allow a number of resource values to be read
+        on a particular widget.  Currently only InterViews 3.0.1 Styles
 	and their attributes are supported.  In addition, the current
 	user interface  only supports the return of 1 resource.  The ability
 	to specify and return multiple resources is defined for future editres
 	interfaces where some or all of a widgets resource values are returned
-	and displayed at once. 
+	and displayed at once.
 
 
 ************************************************************/
@@ -295,7 +295,7 @@ typedef enum {
   SendWidgetTree = 0,
 	       SetValues      = 1,
 	       GetResources   = 2,
-	       GetGeometry    = 3, 
+	       GetGeometry    = 3,
 	       FindChild      = 4,
 	       GetValues      = 5
 } EditresCommand;
diff --git a/libXmu/include/X11/Xmu/Error.h b/libXmu/include/X11/Xmu/Error.h
index c69bf141e..e275fea1d 100644
--- a/libXmu/include/X11/Xmu/Error.h
+++ b/libXmu/include/X11/Xmu/Error.h
@@ -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/include/X11/Xmu/Initer.h b/libXmu/include/X11/Xmu/Initer.h
index 2ba86e833..415885d0d 100644
--- a/libXmu/include/X11/Xmu/Initer.h
+++ b/libXmu/include/X11/Xmu/Initer.h
@@ -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/include/X11/Xmu/Misc.h b/libXmu/include/X11/Xmu/Misc.h
index 650771b19..6ae6227c4 100644
--- a/libXmu/include/X11/Xmu/Misc.h
+++ b/libXmu/include/X11/Xmu/Misc.h
@@ -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
diff --git a/libXmu/include/X11/Xmu/StdCmap.h b/libXmu/include/X11/Xmu/StdCmap.h
index afad78f6d..326167375 100644
--- a/libXmu/include/X11/Xmu/StdCmap.h
+++ b/libXmu/include/X11/Xmu/StdCmap.h
@@ -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/include/X11/Xmu/StdSel.h b/libXmu/include/X11/Xmu/StdSel.h
index c61214dd9..b7808753f 100644
--- a/libXmu/include/X11/Xmu/StdSel.h
+++ b/libXmu/include/X11/Xmu/StdSel.h
@@ -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/include/X11/Xmu/WinUtil.h b/libXmu/include/X11/Xmu/WinUtil.h
index c3d11a86a..3d187b9b8 100644
--- a/libXmu/include/X11/Xmu/WinUtil.h
+++ b/libXmu/include/X11/Xmu/WinUtil.h
@@ -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/include/X11/Xmu/Xmu.h b/libXmu/include/X11/Xmu/Xmu.h
index ad7948846..e49ad6fe9 100644
--- a/libXmu/include/X11/Xmu/Xmu.h
+++ b/libXmu/include/X11/Xmu/Xmu.h
@@ -1,4 +1,4 @@
-/* 
+/*
 
 Copyright 1988, 1998  The Open Group
 
@@ -49,14 +49,14 @@ typedef struct _XmuSegment {
   struct _XmuSegment *next;
 } XmuSegment;
 
-typedef struct _XmuScanline {   
+typedef struct _XmuScanline {
   int y;
   XmuSegment *segment;
   struct _XmuScanline *next;
 } XmuScanline;
-                              
+
 typedef struct _XmuArea {
-  XmuScanline *scanline;     
+  XmuScanline *scanline;
 } XmuArea;
 
 #define XmuCreateArea()		XmuNewArea(0, 0, 0, 0)