Trim trailing whitespace from lines

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

24 files changed, 168 insertions, 168 deletions

diff --git a/Makefile.am b/Makefile.am
index 248e55e..7512762 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-# 
+#
 #  Copyright 2005  Red Hat, Inc.
-# 
+#
 #  Permission to use, copy, modify, distribute, and sell this software and its
 #  documentation for any purpose is hereby granted without fee, provided that
 #  the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@
 #  specific, written prior permission.  Red Hat makes no
 #  representations about the suitability of this software for any purpose.  It
 #  is provided "as is" without express or implied warranty.
-# 
+#
 #  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 #  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 #  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/Xmh.sample b/Xmh.sample
index e69ca82..53252f1 100644
--- a/Xmh.sample
+++ b/Xmh.sample
@@ -51,7 +51,7 @@ Xmh*messageMenu.MenuOnScreen: True
 
 Xmh*folderTitlebar.translations: #override\n\
 <BtnDown>: XawPositionSimpleMenu(folderMenu)MenuPopup(folderMenu)\n
- 
+
 Xmh*tocTitlebar.translations: #override\n\
 <Btn2Down>: XawPositionSimpleMenu(messageMenu)MenuPopup(messageMenu)\n\
 <BtnDown>: XawPositionSimpleMenu(tocMenu)MenuPopup(tocMenu)\n
diff --git a/bbox.c b/bbox.c
index 5d717f3..1cd9c01 100644
--- a/bbox.c
+++ b/bbox.c
@@ -26,10 +26,10 @@
  */
 /* $XFree86: xc/programs/xmh/bbox.c,v 1.2 2001/10/28 03:34:38 tsi Exp $ */
 
-/* bbox.c -- management of buttons and buttonboxes. 
+/* bbox.c -- management of buttons and buttonboxes.
  *
  * This module implements a simple interface to buttonboxes, allowing a client
- * to create new buttonboxes and manage their contents. 
+ * to create new buttonboxes and manage their contents.
  */
 
 #include "xmh.h"
@@ -47,7 +47,7 @@ void BBoxInit(void)
 
 /*
  * Create a new button box.  The widget for it will be a child of the given
- * scrn's widget, and it will be added to the scrn's pane. 
+ * scrn's widget, and it will be added to the scrn's pane.
  */
 
 ButtonBox BBoxCreate(
@@ -61,7 +61,7 @@ ButtonBox BBoxCreate(
     n = 0;
     XtSetArg(args[n], XtNallowVert, True);	n++;
     XtSetArg(args[n], XtNskipAdjust, True);	n++;
-    
+
     buttonbox->outer =
 	XtCreateManagedWidget(name, viewportWidgetClass, scrn->widget,
 			      args, n);
@@ -98,7 +98,7 @@ static void bboxAddButton(
     Arg		args[5];
 
     buttonbox->numbuttons++;
-    buttonbox->button = (Button *) 
+    buttonbox->button = (Button *)
 	XtRealloc((char *) buttonbox->button,
 		  (unsigned) buttonbox->numbuttons * sizeof(Button));
     button = buttonbox->button[buttonbox->numbuttons - 1] = XtNew(ButtonRec);
@@ -113,7 +113,7 @@ static void bboxAddButton(
 
     if (radio && kind == toggleWidgetClass) {
 	if (buttonbox->numbuttons > 1)
-	    radio_group = (button == buttonbox->button[0]) 
+	    radio_group = (button == buttonbox->button[0])
 		? (buttonbox->button[1]->widget)
 		: (buttonbox->button[0]->widget);
 	else radio_group = NULL;
@@ -142,7 +142,7 @@ void BBoxAddButton(
     Boolean	enabled)
 {
     bboxAddButton(buttonbox, name, kind, enabled, False);
-}    
+}
 
 
 void RadioBBoxAddButton(
@@ -174,7 +174,7 @@ char *RadioBBoxGetCurrent(
 
 /* Remove the given button from its buttonbox, and free all resources
  * used in association with the button.  If the button was the current
- * button in a radio buttonbox, the current button becomes the first 
+ * button in a radio buttonbox, the current button becomes the first
  * button in the box.
  */
 
@@ -183,7 +183,7 @@ void BBoxDeleteButton(
 {
     ButtonBox	buttonbox;
     int		i, found;
-    
+
     if (button == NULL) return;
     buttonbox = button->buttonbox;
     found = False;
@@ -193,7 +193,7 @@ void BBoxDeleteButton(
 	    buttonbox->button[i-1] = buttonbox->button[i];
 	else if (buttonbox->button[i] == button) {
 	    found = True;
- 
+
 	    /* Free the resources used by the given button. */
 
 	    if (button->menu != NULL && button->menu != NoMenuForButton)
@@ -201,7 +201,7 @@ void BBoxDeleteButton(
 	    XtDestroyWidget(button->widget);
 	    XtFree(button->name);
 	    XtFree((char *) button);
-	} 
+	}
     }
     if (found)
 	buttonbox->numbuttons--;
@@ -322,7 +322,7 @@ Widget	BBoxMenuOfButton(
 }
 
 
-/* Set maximum size for a bbox so that it cannot be resized any taller 
+/* Set maximum size for a bbox so that it cannot be resized any taller
  * than the space needed to stack all the buttons on top of each other.
  * Allow the user to set the minimum size.
  */
diff --git a/bboxint.h b/bboxint.h
index fc062b0..f14551f 100644
--- a/bboxint.h
+++ b/bboxint.h
@@ -1,4 +1,4 @@
-/* $XConsortium: bboxint.h,v 2.10 89/09/15 16:10:22 converse Exp $ 
+/* $XConsortium: bboxint.h,v 2.10 89/09/15 16:10:22 converse Exp $
  *
  *			  COPYRIGHT 1987
  *		   DIGITAL EQUIPMENT CORPORATION
diff --git a/command.c b/command.c
index 725981f..0e12c7f 100644
--- a/command.c
+++ b/command.c
@@ -72,7 +72,7 @@ static void CheckReadFromPipe(int, char **, int *, Bool);
 static void SystemError(char* text)
 {
     char msg[BUFSIZ];
-    sprintf( msg, "%s; errno = %d %s", text, errno, 
+    sprintf( msg, "%s; errno = %d %s", text, errno,
 	     strerror(errno));
     XtWarning( msg );
 }
@@ -278,7 +278,7 @@ static int _DoCommandToFileOrPipe(
 		if (type_ahead_count < TYPEAHEADSIZE) {
 		    if (++type_ahead_count == TYPEAHEADSIZE) {
 			altQueue = (XEvent*)XtMalloc(
-				(Cardinal)TYPEAHEADSIZE*sizeof(XEvent) );     
+				(Cardinal)TYPEAHEADSIZE*sizeof(XEvent) );
 			alt_queue_size = TYPEAHEADSIZE;
 			eventP = altQueue;
 		    }
@@ -332,7 +332,7 @@ static int _DoCommandToFileOrPipe(
 	        (strcmp(argv[1], "-c") == 0)) {
 	        status->shell_command = XtNewString(argv[2]);
             } else status->shell_command = (char*) NULL;
-	
+
 	    while (status->error_buffer[status->error_buf_size-1]  == '\0')
 		status->error_buf_size--;
 	    while (status->error_buffer[status->error_buf_size-1]  == '\n')
@@ -460,7 +460,7 @@ char *DoCommandToString(char ** argv)
     DEBUG1("('%s')\n", result)
     return result;
 }
-    
+
 
 /* Execute the command to a temporary file, and return the name of the file. */
 
diff --git a/configure.ac b/configure.ac
index 8f7fad3..3c08a44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 
 dnl  Copyright 2005 Red Hat, Inc.
-dnl 
+dnl
 dnl  Permission to use, copy, modify, distribute, and sell this software and its
 dnl  documentation for any purpose is hereby granted without fee, provided that
 dnl  the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@ dnl  advertising or publicity pertaining to distribution of the software without
 dnl  specific, written prior permission.  Red Hat makes no
 dnl  representations about the suitability of this software for any purpose.  It
 dnl  is provided "as is" without express or implied warranty.
-dnl 
+dnl
 dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 dnl  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/folder.c b/folder.c
index 949373a..dcdda95 100644
--- a/folder.c
+++ b/folder.c
@@ -118,7 +118,7 @@ void DoClose(
 #endif
     }
     else {
-	if (MsgSetScrn((Msg) NULL, scrn, confirm_callbacks, 
+	if (MsgSetScrn((Msg) NULL, scrn, confirm_callbacks,
 		       (XtCallbackList) NULL) == NEEDS_CONFIRMATION)
 	    return;
 	DestroyScrn(scrn);	/* doesn't destroy first toc&view scrn */
@@ -169,12 +169,12 @@ void XmhOpenFolder(
      * In this case, the action will open a folder only if that folder
      * was actually selected from a folder button or menu.  If the folder
      * was selected from a folder menu, the menu entry callback procedure,
-     * which changes the selected folder, and is invoked by the "notify" 
+     * which changes the selected folder, and is invoked by the "notify"
      * action, must have already executed; and the menu entry "unhightlight"
      * action must execute after this action.
      *
      * This action does not execute if invoked as an accelerator whose
-     * source widget is a menu button or a folder menu.  However, it 
+     * source widget is a menu button or a folder menu.  However, it
      * may be invoked as a keyboard accelerator of any widget other than
      * the folder menu buttons or the folder menus.  In that case, it will
      * open the currently selected folder.
@@ -206,7 +206,7 @@ void DoComposeMessage(
     MapScrn(scrn);
 }
 
-   
+
 /*ARGSUSED*/
 void XmhComposeMessage(
     Widget	w,
@@ -232,7 +232,7 @@ void DoOpenFolderInNewWindow(
 	scrn = CreateNewScrn(STtocAndView);
 	TocSetScrn(toc, scrn);
 	MapScrn(scrn);
-    } else 
+    } else
 	PopupError(scrn->parent, "Cannot open selected folder.");
 }
 
@@ -271,13 +271,13 @@ static void CreateFolder(
     toc = TocGetNamed(name);
     if ((toc) || (i==0) || (name[0]=='/') || ((toc = TocCreateFolder(name))
 					      == NULL)) {
-	if (toc) 
+	if (toc)
 	    (void) sprintf(str, "Folder \"%s\" already exists.  Try again.",
 			   name);
 	else if (name[0]=='/')
 	    (void) sprintf(str, "Please specify folders relative to \"%s\".",
 			   app_resources.mail_path);
-	else 
+	else
 	    (void) sprintf(str, "Cannot create folder \"%s\".  Try again.",
 			   name);
 	label = XtNewString(str);
@@ -391,7 +391,7 @@ static void CheckAndConfirmDeleteFolder(
     confirms[0].closure = client_data;
     confirms[1].callback = (XtCallbackProc) NULL;
     confirms[1].closure = (XtPointer) NULL;
-    
+
     cancels[0].callback = (XtCallbackProc) CancelDeleteFolder;
     cancels[0].closure = client_data;
     cancels[1].callback = (XtCallbackProc) NULL;
@@ -422,19 +422,19 @@ static void CheckAndDeleteFolder(
     XtCallbackRec cancels[2];
     int 	i;
     char	*foldername;
-    
+
     /* Check for changes occurring after the popup was first presented. */
 
     confirms[0].callback = (XtCallbackProc) CheckAndConfirmDeleteFolder;
     confirms[0].closure = client_data;
     confirms[1].callback = (XtCallbackProc) NULL;
     confirms[1].closure = (XtPointer) NULL;
-    
+
     cancels[0].callback = (XtCallbackProc) CancelDeleteFolder;
     cancels[0].closure = client_data;
     cancels[1].callback = (XtCallbackProc) NULL;
     cancels[1].closure = (XtPointer) NULL;
-    
+
     if (TocConfirmCataclysm(toc, confirms, cancels) == NEEDS_CONFIRMATION)
 	return;
 
@@ -451,7 +451,7 @@ static void CheckAndDeleteFolder(
 		char *c = strchr( strcpy(parent_folder, foldername), '/');
 		*c = '\0';
 
-/* Since menus are built upon demand, and are a per-xmh-screen resource, 
+/* Since menus are built upon demand, and are a per-xmh-screen resource,
  * not all xmh toc & view screens will have the same menus built.
  * So the menu entry deletion routines must be able to handle a button
  * whose menu field is null.  It would be better to share folder menus
@@ -461,7 +461,7 @@ static void CheckAndDeleteFolder(
 
 		DeleteFolderMenuEntry
 		    ( BBoxFindButtonNamed( scrnList[i]->folderbuttons,
-					  parent_folder), 
+					  parent_folder),
 		     foldername);
 	    }
 	    else {
@@ -472,13 +472,13 @@ static void CheckAndDeleteFolder(
 
 	    /* If we've deleted the current folder, show the Initial Folder */
 
-	    if ((! strcmp(scrnList[i]->curfolder, foldername)) 
+	    if ((! strcmp(scrnList[i]->curfolder, foldername))
 		&& (BBoxNumButtons(scrnList[i]->folderbuttons))
 		&& (strcmp(foldername, app_resources.initial_folder_name)))
 		TocSetScrn(InitialFolder, scrnList[i]);
 	}
     XtFree(foldername);
-    if (deleteData->original_toc != NULL) 
+    if (deleteData->original_toc != NULL)
 	TocSetScrn(deleteData->original_toc, scrn);
     XtFree((char *) deleteData);
 }
@@ -503,7 +503,7 @@ void DoDeleteFolder(
 	return;
     }
 
-    /* Prevent more than one confirmation popup on the same folder. 
+    /* Prevent more than one confirmation popup on the same folder.
      * TestAndSet returns true if there is a delete pending on this folder.
      */
     if (TocTestAndSetDeletePending(toc))	{
@@ -582,7 +582,7 @@ static int IsFolder(char *name)
 static void DoSelectFolder(
     Widget 	w,		/* the menu entry object */
     XtPointer	closure,	/* foldername */
-    XtPointer	data)	
+    XtPointer	data)
 {
     Scrn	scrn = ScrnFromWidget(w);
     SetCurrentFolderName(scrn, (char *) closure);
@@ -598,7 +598,7 @@ static void FreeMenuData(
 }
 
 /* Function name:	AddFolderMenuEntry
- * Description:	
+ * Description:
  *	Add an entry to a menu.  If the menu is not already created,
  *	create it, including the (already existing) new subfolder directory.
  * 	If the menu is already created,	add the new entry.
@@ -649,17 +649,17 @@ static void AddFolderMenuEntry(
 	name = c;
     }
     XtSetArg(args[2], XtNlabel, label);				/* THREE */
-    XtCreateManagedWidget(name, smeBSBObjectClass, button->menu, 
+    XtCreateManagedWidget(name, smeBSBObjectClass, button->menu,
 			  args, THREE);
 }
 
 
 
 /* Function name:	CreateFolderMenu
- * Description:	
+ * Description:
  *	Menus are created for folder buttons if the folder has at least one
- *	subfolder.  For the directory given by the concatenation of 
- *	app_resources.mail_path, '/', and the name of the button, 
+ *	subfolder.  For the directory given by the concatenation of
+ *	app_resources.mail_path, '/', and the name of the button,
  *	CreateFolderMenu creates the menu whose entries are
  *	the subdirectories which do not begin with '.' and do not have
  *	names which are all digits, and do not have names which are a '#'
@@ -689,7 +689,7 @@ static void CreateFolderMenu(
 
     button->menu = XtCreatePopupShell("menu", simpleMenuWidgetClass,
 				      button->widget, (ArgList) NULL, ZERO);
-	
+
     /* The first entry is always the parent folder */
 
     AddFolderMenuEntry(button, button->name);
@@ -722,13 +722,13 @@ static void DeleteFolderMenuEntry(
     int		n;
     char	tmpname[300];
     Widget	entry;
-    
+
     if (button == NULL || button->menu == NULL) return;
     XtSetArg(args[0], XtNnumChildren, &n);
     XtSetArg(args[1], XtNlabel, &c);
     XtGetValues(button->menu, args, TWO);
     if ((n <= 3 && c) || n <= 2) {
-	XtDestroyWidget(button->menu);	
+	XtDestroyWidget(button->menu);
 	button->menu = NoMenuForButton;
 	return;
     }
@@ -749,10 +749,10 @@ static void DeleteFolderMenuEntry(
 
 /* Function Name:	PopupFolderMenu
  * Description:		This action should always be taken when the user
- *	selects a folder button.  A folder button represents a folder 
+ *	selects a folder button.  A folder button represents a folder
  *	and zero or more subfolders.  The menu of subfolders is built upon
- *	the first reference to it, by this routine.  If there are no 
- *	subfolders, this routine will mark the folder as having no 
+ *	the first reference to it, by this routine.  If there are no
+ *	subfolders, this routine will mark the folder as having no
  *	subfolders, and no menu will be built.  In that case, the menu
  *	button emulates a command button.  When subfolders exist,
  *	the menu will popup, using the menu button action PopupMenu.
@@ -786,7 +786,7 @@ void XmhPopupFolderMenu(
 
 
 /* Function Name:	XmhSetCurrentFolder
- * Description:		This action procedure allows menu buttons to 
+ * Description:		This action procedure allows menu buttons to
  *	emulate toggle widgets in their function of folder selection.
  *	Therefore, mh folders with no subfolders can be represented
  * 	by a button instead of a menu with one entry.  Sets the currently
@@ -810,7 +810,7 @@ void XmhSetCurrentFolder(
      * insured by the XmhPopupFolderMenu action setting LastMenuButtonPressed.
      * The action XmhLeaveFolderButton, and it's translation in the application
      * defaults file, bound to LeaveWindow events, insures that the menu
-     * button behaves properly when the user moves the pointer out of the 
+     * button behaves properly when the user moves the pointer out of the
      * menu button window.
      *
      * This action is for menu button widgets only.
@@ -874,7 +874,7 @@ void XmhPushFolder(
     Scrn	scrn = ScrnFromWidget(w);
     Cardinal	i;
 
-    for (i=0; i < *count; i++) 
+    for (i=0; i < *count; i++)
 	Push(&scrn->folder_stack, params[i]);
 
     if (*count == 0 && scrn->curfolder)
@@ -925,7 +925,7 @@ void XmhWMProtocols(
 #define DO_DELETE_WINDOW InParams(WM_DELETE_WINDOW, params, *num_params)
 #define DO_SAVE_YOURSELF InParams(WM_SAVE_YOURSELF, params, *num_params)
 
-    /* Respond to a recognized WM protocol request iff 
+    /* Respond to a recognized WM protocol request iff
      * event type is ClientMessage and no parameters are passed, or
      * event type is ClientMessage and event data is matched to parameters, or
      * event type isn't ClientMessage and parameters make a request.
@@ -953,7 +953,7 @@ void XmhWMProtocols(
     if (sy) {
 	register int i;
 	for (i=0; i<numScrns; i++)
-	    if (scrnList[i]->msg) 
+	    if (scrnList[i]->msg)
 		MsgCheckPoint(scrnList[i]->msg);
 	if (w) /* don't generate a property notify via the checkpoint timer */
 	    XChangeProperty(XtDisplay(toplevel), XtWindow(toplevel),
diff --git a/globals.h b/globals.h
index 5565331..791901d 100644
--- a/globals.h
+++ b/globals.h
@@ -127,7 +127,7 @@ extern Boolean	subProcessRunning; /* interlock for DoCommand/CheckMail */
 typedef struct _XmhMenuEntry {
     char	*name;			/* menu entry name */
     void   	(*function)(XMH_CB_ARGS); /* menu entry callback function */
-} XmhMenuEntryRec, *XmhMenuEntry;	
+} XmhMenuEntryRec, *XmhMenuEntry;
 
 
 typedef struct _XmhMenuButtonDesc {
diff --git a/init.c b/init.c
index f13b7bf..736b865 100644
--- a/init.c
+++ b/init.c
@@ -139,7 +139,7 @@ static XtResource resources[] = {
 	 Offset(pointer_color), XtRString, XtDefaultForeground},
     {"showOnInc", "ShowOnInc", XtRBoolean, sizeof(Boolean),
 	 Offset(show_on_inc), XtRImmediate, (XtPointer)True},
-    {"stickyMenu", "StickyMenu", XtRBoolean, sizeof(Boolean), 	
+    {"stickyMenu", "StickyMenu", XtRBoolean, sizeof(Boolean),
 	 Offset(sticky_menu), XtRImmediate, (XtPointer)False},
     {"prefixWmAndIconName", "PrefixWmAndIconName", XtRBoolean, sizeof(Boolean),
 	 Offset(prefix_wm_and_icon_name), XtRImmediate, (XtPointer)True},
@@ -157,7 +157,7 @@ static XtResource resources[] = {
 	 Offset(app_defaults_version), XtRImmediate, (XtPointer)0},
     {"banner", "Banner", XtRString, sizeof(char *),
 	 Offset(banner), XtRString, XMH_VERSION},
-    {"wmProtocolsTranslations", "WMProtocolsTranslations", 
+    {"wmProtocolsTranslations", "WMProtocolsTranslations",
 	 XtRTranslationTable, sizeof(XtTranslations),
 	 Offset(wm_protocols_translations), XtRString,
 	 "<Message>WM_PROTOCOLS: XmhWMProtocols()\n"}
@@ -353,7 +353,7 @@ void InitializeWorld(int argc, char **argv)
 	{"XmhPromptOkayAction",		XmhPromptOkayAction},
 
 	/* retained for backward compatibility with user resources */
-	
+
 	{"XmhCancelPick",		XmhWMProtocols}
     };
 
@@ -477,13 +477,13 @@ void InitializeWorld(int argc, char **argv)
     BBoxInit();
 
     XtAppAddActions(app, actions, XtNumber(actions));
-    XtRegisterGrabAction(XmhPopupFolderMenu, True, 
+    XtRegisterGrabAction(XmhPopupFolderMenu, True,
 			 ButtonPressMask | ButtonReleaseMask,
 			 GrabModeAsync, GrabModeAsync);
     wm_protocols = XInternAtom(XtDisplay(toplevel), "WM_PROTOCOLS", False);
     protocolList[0] = wm_delete_window =
 	XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW", False);
-    protocolList[1] = wm_save_yourself = 
+    protocolList[1] = wm_save_yourself =
 	XInternAtom(XtDisplay(toplevel), "WM_SAVE_YOURSELF", False);
 
     XtAddCallback(toplevel, XtNsaveCallback, DoSaveYourself, (XtPointer)NULL);
@@ -501,7 +501,7 @@ void InitializeWorld(int argc, char **argv)
     SetCursorColor(scrn->parent, app_resources.cursor,
 		   app_resources.pointer_color);
     if (app_resources.block_events_on_busy)
-	SetCursorColor(scrn->parent, app_resources.busy_cursor, 
+	SetCursorColor(scrn->parent, app_resources.busy_cursor,
 		       app_resources.busy_pointer_color);
 
     DEBUG(" setting toc ... ")
diff --git a/main.c b/main.c
index 5d44051..021c3cf 100644
--- a/main.c
+++ b/main.c
@@ -167,6 +167,6 @@ int main(int argc, char **argv)
     }
 #ifdef DEBUG_CLEANUP
     XtDestroyApplicationContext(appCtx);
-#endif    
+#endif
     exit(0);
 }
diff --git a/man/xmh.man b/man/xmh.man
index f91945b..a87cd59 100644
--- a/man/xmh.man
+++ b/man/xmh.man
@@ -680,7 +680,7 @@ Meta-Shift Backspace	Kill Previous Word
 .TE
 .sp
 In addition, the pointer may be used to copy and paste text:
-.TS 
+.TS
 l l.
 Button 1 Down	Start Selection
 Button 1 Motion	Adjust Selection
diff --git a/miscfuncs.c b/miscfuncs.c
index ea6454b..9846bc0 100644
--- a/miscfuncs.c
+++ b/miscfuncs.c
@@ -54,7 +54,7 @@ int ftruncate_emu(
     (void) unlink(tmp_file);
     new_fid = open(tmp_file, O_RDWR | O_CREAT);
     lseek(fd, (off_t)0, 0);
-	
+
     /* Copy original file to temp file. */
     for (i = 0; i < length / CHUNKSIZE; i++) {
 	if (read(fd, buffer, CHUNKSIZE) != CHUNKSIZE) {
diff --git a/msg.c b/msg.c
index b43b8ea..902d224 100644
--- a/msg.c
+++ b/msg.c
@@ -283,7 +283,7 @@ static void RemoveMsgConfirmed(Scrn scrn)
 	(void) unlink(MsgFileName(scrn->msg));
 	TocRemoveMsg(scrn->msg->toc, scrn->msg);
 	MsgFree(scrn->msg);
-    }		
+    }
 }
 
 
@@ -332,8 +332,8 @@ static void ConfirmedWithScrn(
     SetScrnNewMsg(mas->msg, mas->scrn);
     XtFree((char *) mas);
 }
-    
-    
+
+
 static int SetScrn(
     Msg		msg,
     Scrn	scrn,
@@ -421,7 +421,7 @@ int MsgSetScrn(
 
 void MsgSetScrnForComp(Msg msg, Scrn scrn)
 {
-    (void) SetScrn(msg, scrn, FALSE, (XtCallbackList) NULL, 
+    (void) SetScrn(msg, scrn, FALSE, (XtCallbackList) NULL,
 		   (XtCallbackList) NULL);
 }
 
@@ -609,7 +609,7 @@ int MsgChanged(Msg msg)
 
 /* Call the given function when the msg changes. */
 
-void 
+void
 MsgSetCallOnChange(Msg msg, void (*func)(XMH_CB_ARGS), XtPointer param)
 {
   Arg args[1];
@@ -796,7 +796,7 @@ void MsgLoadReply(
 
 
 
-/* Load a msg with a template of forwarding a list of messages.  Set 
+/* Load a msg with a template of forwarding a list of messages.  Set
    msg->startPos so that the text insertion point will be placed at the end
    of the first line (which is usually a "To:" field). */
 
@@ -819,7 +819,7 @@ void MsgLoadForward(
     }
     argv[2 + i] = "-nowhatnowproc";
     argv[3 + i] = "-nodraftfolder";
-    memmove( (char *)(argv + 4 + i), (char *)params, 
+    memmove( (char *)(argv + 4 + i), (char *)params,
 	  num_params * sizeof(String *));
     DoCommand(argv, (char *) NULL, (char *) NULL);
     for (i = 1; i < 2 + mlist->nummsgs; i++)
@@ -829,7 +829,7 @@ void MsgLoadForward(
     RestoreDraft();
     TocSetCacheValid(msg->toc);
     msg->source = CreateFileSource(scrn->viewlabel, MsgFileName(msg), True);
-    msg->startPos = XawTextSourceScan(msg->source, (XawTextPosition) 0, 
+    msg->startPos = XawTextSourceScan(msg->source, (XawTextPosition) 0,
 				      XawstEOL, XawsdRight, 1, False);
 }
 
@@ -922,7 +922,7 @@ void XmhInsert(
 }
 
 /*	Function Name: CreateFileSource
- *	Description: Creates an AsciiSource for a file. 
+ *	Description: Creates an AsciiSource for a file.
  *	Arguments: w - the widget to create the source for.
  *                 filename - the file to assign to this source.
  *                 edit - if TRUE then this disk source is editable.
@@ -937,12 +937,12 @@ CreateFileSource(Widget w, String filename, Boolean edit)
 
   XtSetArg(arglist[num_args], XtNtype, XawAsciiFile);  num_args++;
   XtSetArg(arglist[num_args], XtNstring, filename);    num_args++;
-  if (edit) 
+  if (edit)
       XtSetArg(arglist[num_args], XtNeditType, XawtextEdit);
   else
       XtSetArg(arglist[num_args], XtNeditType, XawtextRead);
   num_args++;
 
-  return(XtCreateWidget("textSource", asciiSrcObjectClass, w, 
+  return(XtCreateWidget("textSource", asciiSrcObjectClass, w,
 			arglist, num_args));
 }
diff --git a/pick.c b/pick.c
index 836867d..d0a6ad8 100644
--- a/pick.c
+++ b/pick.c
@@ -204,7 +204,7 @@ static void ChangeTextEntry(FormEntry entry, char *str)
 
     XtSetArg(arglist[0], XtNstring, &ptr);
     XtGetValues(entry->widget, arglist, (Cardinal) 1);
-    if (strcmp(str, ptr) == 0) 
+    if (strcmp(str, ptr) == 0)
         return;
 
     XtSetArg(arglist[0], XtNstring, str);
@@ -227,7 +227,7 @@ static void ExecRowOr(
     AddButton(row, "Or", ExecRowOr);
     ExecuteUpdate(form);
 }
-    
+
 
 /* ARGSUSED */
 static void ExecGroupOr(
@@ -289,25 +289,25 @@ static Boolean ParseRow(RowList row)
 		AppendArgv("-lbrace");
 	    }
 	    switch (row->type) {
-		case RTfrom: 
+		case RTfrom:
 		    AppendArgv("-from");
 		    break;
-		case RTto: 
+		case RTto:
 		    AppendArgv("-to");
 		    break;
-		case RTcc: 
+		case RTcc:
 		    AppendArgv("-cc");
 		    break;
-		case RTdate: 
+		case RTdate:
 		    AppendArgv("-date");
 		    break;
-		case RTsubject: 
+		case RTsubject:
 		    AppendArgv("-subject");
 		    break;
-		case RTsearch: 
+		case RTsearch:
 		    AppendArgv("-search");
 		    break;
-		case RTother: 
+		case RTother:
 		    XtSetArg(args[0], XtNstring, &other);
 		    XtGetValues(row->wlist[2]->widget, args, (Cardinal) 1);
 		    (void) sprintf(str, "--%s", other);
@@ -325,7 +325,7 @@ static Boolean ParseRow(RowList row)
     }
     return result;
 }
-	    
+
 
 static Boolean ParseGroup(Group group)
 {
@@ -490,11 +490,11 @@ static FormEntry CreateWidget(
     entry->widget = XtCreateManagedWidget( (String) NULL, class, row->widget,
 					   merged_args,
 					   num_args + XtNumber(arglist) );
-			
+
     XtFree((char *) merged_args);
     return entry;
 }
-    
+
 
 static void
 DeleteWidget(FormEntry entry)
@@ -614,7 +614,7 @@ AddDetailGroup(FormBox form)
     AddButton(row, "- Or -", ExecGroupOr);
     XtManageChild(row->widget);
     if (XtIsRealized(XtParent(group->widget)))
-	XtRealizeWidget(group->widget); 
+	XtRealizeWidget(group->widget);
     XtManageChild(group->widget);
 }
 
diff --git a/popup.c b/popup.c
index 59eb3d1..354482d 100644
--- a/popup.c
+++ b/popup.c
@@ -46,7 +46,7 @@ static String XmhNnotice = "notice";
 static String XmhNokay = "okay";
 static String XmhNprompt = "prompt";
 static String XmhNvalue = "value";
-    
+
 /* The popups were originally parented from toplevel and neglected the
  * transientFor resource.  In order not to break existing user resource
  * settings for the popups, transientFor is set independent of the parent,
@@ -95,7 +95,7 @@ static Boolean PositionThePopup(
     Position	y)
 {
     /* Hack.  Fix up the position of the popup.  The xmh app defaults file
-     * contains an Xmh*Geometry specification; the effects of that on 
+     * contains an Xmh*Geometry specification; the effects of that on
      * popups, and the lack of any user-supplied geometry specification for
      * popups, are mitigated here, by giving the popup shell a position.
      * (Xmh*Geometry is needed in case there is no user-supplied default.)
@@ -153,7 +153,7 @@ static void CenterPopupPosition(
 	XtSetValues(popup, args, THREE);
     }
 }
-	 
+
 
 /* Insure that the popup is wholly showing on the screen.
    Optionally center the widget horizontally and/or vertically
@@ -245,7 +245,7 @@ static void TheUsual(
     XtAugmentTranslations(popup, app_resources.wm_protocols_translations);
     XtRealizeWidget(popup);
     XDefineCursor(XtDisplay(popup), XtWindow(popup), app_resources.cursor);
-    (void) XSetWMProtocols(XtDisplay(popup), XtWindow(popup), 
+    (void) XSetWMProtocols(XtDisplay(popup), XtWindow(popup),
 			   protocolList, XtNumber(protocolList));
 }
 
@@ -379,7 +379,7 @@ void PopupNotice(
 
     XawDialogAddButton( dialog, XmhNconfirm,
 		       ((callback != (XtCallbackProc) NULL)
-		          ? callback : (XtCallbackProc) FreePopupStatus), 
+		          ? callback : (XtCallbackProc) FreePopupStatus),
 		       (XtPointer) popup_status
 		      );
 
@@ -412,20 +412,20 @@ void PopupConfirm(
     XtSetArg(args[2], XtNtransientFor, transientFor);
     popup = XtCreatePopupShell(XmhNconfirm, transientShellWidgetClass,
 			       toplevel, args, THREE);
-    PositionThePopup(popup, x, y); 
+    PositionThePopup(popup, x, y);
 
     XtSetArg(args[0], XtNlabel, question);
     dialog = XtCreateManagedWidget(XmhNdialog, dialogWidgetClass, popup, args,
 				   ONE);
-    
+
     callbacks[0].closure = (XtPointer) popup;
     XtSetArg(args[0], XtNcallback, callbacks);
-    button = XtCreateManagedWidget("yes", commandWidgetClass, dialog, 
+    button = XtCreateManagedWidget("yes", commandWidgetClass, dialog,
 				   args, ONE);
     if (affirm_callbacks)
 	XtAddCallbacks(button, XtNcallback, affirm_callbacks);
 
-    button = XtCreateManagedWidget("no", commandWidgetClass, dialog, 
+    button = XtCreateManagedWidget("no", commandWidgetClass, dialog,
 				   args, ZERO);
     XtAddCallback(button, XtNcallback, DestroyPopup, (XtPointer) popup);
     if (negate_callbacks)
@@ -505,7 +505,7 @@ void PopupWarningHandler(
     }
     if (allowPopup) {
 	allowPopup = False;
-	PopupError((Widget)NULL, ptr); 
+	PopupError((Widget)NULL, ptr);
 	allowPopup = True;
     } else {
 	fprintf(stderr, ptr);
diff --git a/screen.c b/screen.c
index f8bc17e..f27fe15 100644
--- a/screen.c
+++ b/screen.c
@@ -116,7 +116,7 @@ Scrn scrn)
     BBoxAddButton(buttonbox, "print", commandWidgetClass, True);
     BBoxAddButton(buttonbox, "delete", commandWidgetClass, True);
 }
-    
+
 
 
 static void FillCompButtons(
@@ -175,7 +175,7 @@ static void MakeCommandMenu(
 
 	    if (indent) { XtSetArg(args[n], XtNleftMargin, 18);	n++; }
 	    widgetclass = smeBSBObjectClass;
-	} else 
+	} else
 	    widgetclass = smeLineObjectClass;
 	XtCreateManagedWidget(e->name, widgetclass, menu, args, n);
     }
@@ -209,7 +209,7 @@ static void MakeTocAndView(Scrn scrn)
     scrn->folderbuttons = BBoxCreate(scrn, "folders");
     scrn->toclabel      = CreateTitleBar(scrn, "tocTitlebar");
     scrn->tocwidget	= CreateTextSW(scrn, "toc", args, XtNumber(args));
-    if (app_resources.command_button_count > 0) 
+    if (app_resources.command_button_count > 0)
 	scrn->miscbuttons = BBoxCreate(scrn, "commandBox");
     scrn->viewlabel     = CreateTitleBar(scrn, "viewTitlebar");
     scrn->viewwidget    = CreateTextSW(scrn, "view", args, (Cardinal) 0);
@@ -431,7 +431,7 @@ Scrn ScrnFromWidget(Widget w) /* heavily used, should be efficient */
     Punt("ScrnFromWidget failed!");
     return NULL;
 }
- 
+
 
 /* Figure out which buttons should and shouldn't be enabled in the given
  * screen.  This should be called whenever something major happens to the
@@ -443,7 +443,7 @@ Scrn ScrnFromWidget(Widget w) /* heavily used, should be efficient */
 static void EnableCallback(Widget w, XtPointer data, XtPointer junk)
 {
   EnableProperButtons( (Scrn) data);
-}  
+}
 
 #define SetButton(buttonbox, name, value) \
     if (value) BBoxEnable(BBoxFindButtonNamed(buttonbox, name)); \
@@ -492,10 +492,10 @@ void EnableProperButtons(Scrn scrn)
 		SetButton(scrn->viewbuttons, "insert",
 			  scrn->assocmsg != NULL ? True : False);
 
-		if (!changed) 
+		if (!changed)
 		    MsgSetCallOnChange(scrn->msg, EnableCallback,
 				       (XtPointer) scrn);
-		else 
+		else
 		    MsgSetCallOnChange(scrn->msg, (XtCallbackProc) NULL,
 				       (XtPointer) NULL);
 
diff --git a/toc.c b/toc.c
index 6340e33..708fb1a 100644
--- a/toc.c
+++ b/toc.c
@@ -85,7 +85,7 @@ static void MakeSureSubfolderExists(
     *subfolder = '\0';
     subfolder++;
     MakeSureFolderExists(namelistptr, numfoldersptr, folder);
-	
+
     /* The parent folder exists.  Make sure the subfolder exists. */
 
     (void) sprintf(subfolder_path, "%s/%s", app_resources.mail_path, name);
@@ -149,7 +149,7 @@ static void LoadCheckFiles(void)
 	       *app_resources.initial_inc_file)
 	InitialFolder->incfile = app_resources.initial_inc_file;
 }
-	    
+
 
 /*	PUBLIC ROUTINES 	*/
 
@@ -312,7 +312,7 @@ void TocCheckForNewMail(
  * You can have confirm popups on different folders simultaneously.
  * However, I did not protect the user from popping up a delete confirm
  * popup on folder A, then popping up a delete confirm popup on folder
- * A/subA, then deleting A, then deleting A/subA -- which of course is 
+ * A/subA, then deleting A, then deleting A/subA -- which of course is
  * already gone, and will cause xmh to Punt.
  *
  * TocClearDeletePending is a callback from the No confirmation button
@@ -358,7 +358,7 @@ static void NukeDirectory(char *path)
 	argv[2] = path;
 	(void) DoCommand(argv, (char*)NULL, (char*)NULL);
 	XtFree((char*)argv);
-    } 
+    }
 }
 
 
@@ -485,7 +485,7 @@ void TocRemoveMsg(Toc toc, Msg msg)
     TocSetCurMsg(toc, newcurmsg);
     TUSaveTocFile(toc);
 }
-    
+
 
 
 void TocRecheckValidity(Toc toc)
@@ -678,7 +678,7 @@ void TocSetSelectedSequence(
     Toc		toc,
     Sequence	sequence)
 {
-    if (toc) 
+    if (toc)
 	toc->selectseq = sequence;
 }
 
@@ -770,7 +770,7 @@ void TocStartUpdate(Toc toc)
 
     if (toc->stopupdate && --(toc->stopupdate) == 0) {
 	for (i=0 ; i<toc->num_scrns ; i++) {
-	    if (toc->needsrepaint) 
+	    if (toc->needsrepaint)
 		TURedisplayToc(toc->scrn[i]);
 	    if (toc->needslabelupdate)
 		TUResetTocLabel(toc->scrn[i]);
@@ -848,15 +848,15 @@ static void TocCataclysmOkay(
 
 /* Doesn't make sense to have this MsgSetScrn for loop here. dmc. %%% */
     for (i=0; i < toc->nummsgs; i++)
-	MsgSetScrn(toc->msgs[i], (Scrn) NULL, (XtCallbackList) NULL, 
+	MsgSetScrn(toc->msgs[i], (Scrn) NULL, (XtCallbackList) NULL,
 		   (XtCallbackList) NULL);
 }
-	
+
 int TocConfirmCataclysm(
     Toc			toc,
     XtCallbackList	confirms,
     XtCallbackList	cancels)
-{	
+{
     register int	i;
 
     static XtCallbackRec yes_callbacks[] = {
@@ -899,21 +899,21 @@ int TocConfirmCataclysm(
 	return 0;
     }
 }
-    
+
 
 /* Commit all the changes in this toc; all messages will meet their 'fate'. */
 
 /*ARGSUSED*/
 void TocCommitChanges(
     Widget	widget,		/* unused */
-    XtPointer	client_data,	
+    XtPointer	client_data,
     XtPointer	call_data)	/* unused */
 {
     Toc toc = (Toc) client_data;
     Msg msg;
     int i, cur = 0;
     char str[100], **argv = NULL;
-    FateType curfate, fate; 
+    FateType curfate, fate;
     Toc desttoc;
     Toc curdesttoc = NULL;
     XtCallbackRec	confirms[2];
@@ -981,7 +981,7 @@ void TocCommitChanges(
 		}
 		if (cur > 40)
 		    break;	/* Do only 40 at a time, just to be safe. */
-	    } 
+	    }
 	    i++;
 	}
 	if (curfate != Fignore) {
@@ -1161,7 +1161,7 @@ Msg TocMsgFromId(Toc toc, int msgid)
     return NULL;
 }
 
-/* Sequence names are put on a stack which is specific to the folder. 
+/* Sequence names are put on a stack which is specific to the folder.
  * Sequence names are very volatile, so we make our own copies of the strings.
  */
 
@@ -1177,13 +1177,13 @@ void XmhPushSequence(
     Cardinal	i;
 
     if (! (toc = scrn->toc)) return;
-    
+
     if (*count == 0) {
 	if (toc->selectseq)
 	    Push(&toc->sequence_stack, XtNewString(toc->selectseq->name));
     }
     else
-	for (i=0; i < *count; i++) 
+	for (i=0; i < *count; i++)
 	    Push(&toc->sequence_stack, XtNewString(params[i]));
 }
 
diff --git a/tocfuncs.c b/tocfuncs.c
index a484bf1..43134c3 100644
--- a/tocfuncs.c
+++ b/tocfuncs.c
@@ -38,7 +38,7 @@ Boolean UserWantsAction(
     Widget	w,
     Scrn	scrn)
 {
-    /* Commands in the command menus invoke callbacks directly. 
+    /* Commands in the command menus invoke callbacks directly.
      * Keyboard accelerators use the command menus as source widgets.
      * Actions can also be specified in the translations for menu buttons.
      * Actions can also be specified in the translations for menus.
@@ -49,10 +49,10 @@ Boolean UserWantsAction(
      * after the mouse pointer has left the folder button or the when the
      * mouse button is released outside of the folder menu.
      *
-     * The side effect of this routine is that it restricts keyboard 
+     * The side effect of this routine is that it restricts keyboard
      * accelerators from originating from folder buttons or folder menus.
      */
-       
+
     if (XtIsSubclass(w, menuButtonWidgetClass) && /* w is a menu button */
 	w != LastMenuButtonPressed)		  /* pointer left the window */
 	return False;
@@ -78,11 +78,11 @@ static void NextAndPreviousView(
 
     if (toc == NULL) return;
     mlist = TocCurMsgList(toc);
-    if (mlist->nummsgs) 
+    if (mlist->nummsgs)
 	msg = (next ? mlist->msglist[0] : mlist->msglist[mlist->nummsgs - 1]);
     else {
 	msg = TocGetCurMsg(toc);
-	if (msg && msg == scrn->msg) 
+	if (msg && msg == scrn->msg)
 	    msg = (next ? TocMsgAfter(toc, msg) : TocMsgBefore(toc, msg));
 	if (msg) fate = MsgGetFate(msg, (Toc *)NULL);
 	while (msg && ((app_resources.skip_deleted && fate == Fdelete)
@@ -152,7 +152,7 @@ void DoPrevView(
     XtPointer	client_data,
     XtPointer	call_data)	/* unused */
 {
-    NextAndPreviousView((Scrn) client_data, 
+    NextAndPreviousView((Scrn) client_data,
 			(app_resources.reverse_read_order ? True : False));
 }
 
@@ -539,7 +539,7 @@ void DoPrint(
     Scrn	scrn = (Scrn) client_data;
     Cardinal	num_params = 0;
     /* The callback interface will not be entered unless the user requested
-     * the action, so pass a widget which will succeed the test in 
+     * the action, so pass a widget which will succeed the test in
      * UserWantsAction.
      */
     XmhPrint(scrn->parent, (XEvent*)NULL, (String*)NULL, &num_params);
@@ -556,7 +556,7 @@ void DoPack(
     Toc		toc = scrn->toc;
     XtCallbackRec confirms[2];
     char	**argv;
-    
+
     if (toc == NULL) return;
     confirms[0].callback = (XtCallbackProc) DoPack;
     confirms[0].closure = (XtPointer) scrn;
@@ -664,7 +664,7 @@ void DoForceRescan(
     if (app_resources.block_events_on_busy) ShowBusyCursor();
 
     TocForceRescan(toc);
-    
+
     if (app_resources.block_events_on_busy) UnshowBusyCursor();
 }
 
@@ -749,7 +749,7 @@ static void DoReplyMsg(
     }
     FreeMsgList(mlist);
 }
-    
+
 
 /*ARGSUSED*/
 void DoReply(
@@ -759,7 +759,7 @@ void DoReply(
 {
     DoReplyMsg((Scrn) client_data, (String *)NULL, (Cardinal)0);
 }
-    
+
 
 /*ARGSUSED*/
 void XmhReply(
@@ -902,7 +902,7 @@ void XmhOpenSequence(
 
 	/* The user released the mouse button.  We must distinguish between
 	 * a button release on a selectable menu entry, and a button release
-	 * occurring elsewhere.  The button releases occurring elsewhere are 
+	 * occurring elsewhere.  The button releases occurring elsewhere are
 	 * either outside of the menu, or on unselectable menu entries.
 	 */
 
@@ -912,7 +912,7 @@ void XmhOpenSequence(
 	/* Some entry in the menu was selected.  The menu entry's callback
 	 * procedure has already executed.  If a sequence name was selected,
 	 * the callback procedure has caused that sequence to become the
-	 * currently selected sequence.  If selected menu entry object's 
+	 * currently selected sequence.  If selected menu entry object's
 	 * name matches the currently selected sequence, we should open
 	 * that sequence.  Otherwise, the user must have selected a sequence
 	 * manipulation command, such as Pick.  The assumptions here are that
@@ -926,7 +926,7 @@ void XmhOpenSequence(
 	    DoOpenSeq(w, (XtPointer) scrn, (XtPointer) NULL);
 	return;
     }
-    
+
     /* An accelerator open sequence function */
 
     DoOpenSeq(w, (XtPointer) scrn, (XtPointer) NULL);
diff --git a/tocutil.c b/tocutil.c
index 92bb84c..eacea43 100644
--- a/tocutil.c
+++ b/tocutil.c
@@ -57,7 +57,7 @@ int TUScanFileOutOfDate(Toc toc)
 }
 
 
-/* Make sure the sequence menu entries correspond exactly to the sequences 
+/* Make sure the sequence menu entries correspond exactly to the sequences
  * for this toc.
  */
 
@@ -99,7 +99,7 @@ void TUCheckSequenceMenu(Toc toc)
 
 	/* Erase the current check mark. */
 
-	for (i=(n-1); i < numChildren; i++) 
+	for (i=(n-1); i < numChildren; i++)
 	    ToggleMenuItem(children[i], False);
 
 	/* Delete any entries which should be deleted. */
@@ -109,9 +109,9 @@ void TUCheckSequenceMenu(Toc toc)
 		XtDestroyWidget(children[i]);
 
 	/* Create any entries which should be created. */
-	
+
 	callbacks[0].closure = (XtPointer) scrn;
-	for (i=1; i < toc->numsequences; i++) 
+	for (i=1; i < toc->numsequences; i++)
 	    if (! XtNameToWidget(menu, toc->seqlist[i]->name))
 		XtCreateManagedWidget(toc->seqlist[i]->name, smeBSBObjectClass,
 				      menu, args, XtNumber(args));
@@ -393,7 +393,7 @@ void TULoadTocFile(Toc toc)
 	    buf[bufsiz-2] = '\n';
 	    msg->buf = strcpy(XtMalloc((Cardinal) ++l), ptr);
 	    msg->msgid = atoi(ptr);
-	    do 
+	    do
 		ptr = fgets(buf, bufsiz, fid);
 	    while (ptr && (int) strlen(ptr) == app_resources.toc_width
 		   && buf[bufsiz-2] != '\n');
@@ -609,7 +609,7 @@ Msg TUAppendToc(Toc toc, char *ptr)
     TUGetFullFolderInfo(toc);
     if (toc->validity != valid)
 	return NULL;
-	    
+
     if (toc->nummsgs > 0)
 	msgid = toc->msgs[toc->nummsgs - 1]->msgid + 1;
     else
diff --git a/tsource.c b/tsource.c
index c65bc88..c67a31d 100644
--- a/tsource.c
+++ b/tsource.c
@@ -44,7 +44,7 @@
 #define Offset(field) XtOffsetOf(TocSourceRec, toc_source.field)
 
 static XtResource resources[] = {
-    {XtNtoc, XtCToc, XtRPointer, sizeof(caddr_t), 
+    {XtNtoc, XtCToc, XtRPointer, sizeof(caddr_t),
        Offset(toc), XtRPointer, NULL},
 };
 
@@ -59,7 +59,7 @@ static int Replace(Widget, XawTextPosition, XawTextPosition, XawTextBlock *);
 #define SuperClass		(&textSrcClassRec)
 TocSourceClassRec tocSourceClassRec = {
   {
-/* core_class fields */	
+/* core_class fields */
     /* superclass	  	*/	(WidgetClass) SuperClass,
     /* class_name	  	*/	"TocSrc",
     /* widget_size	  	*/	sizeof(TocSourceRec),
@@ -184,7 +184,7 @@ Read(
 /* Right now, we can only replace a piece with another piece of the same size,
    and it can't cross between lines. */
 
-static int 
+static int
 Replace(
     Widget w,
     XawTextPosition startPos,
@@ -204,7 +204,7 @@ Replace(
 /*    for (i=0 ; i<toc->numwidgets ; i++)
 	XawTextInvalidate(toc->widgets[i], startPos, endPos);
 *
-* CDP 9/1/89 
+* CDP 9/1/89
 */
     return XawEditDone;
 }
@@ -225,7 +225,7 @@ Replace(
 
 
 
-static XawTextPosition 
+static XawTextPosition
 Scan(
     Widget w,
     XawTextPosition position,
@@ -338,6 +338,6 @@ static void Initialize(
 void
 TSourceInvalid(Toc toc, XawTextPosition position, int length)
 {
-  XawTextInvalidate(XtParent(toc->source), position, 
+  XawTextInvalidate(XtParent(toc->source), position,
 		    (XawTextPosition) position+length-1);
 }
diff --git a/tsource.h b/tsource.h
index 7dfd9ff..e6dfc54 100644
--- a/tsource.h
+++ b/tsource.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/tsourceP.h b/tsourceP.h
index 71582bd..ac848d9 100644
--- a/tsourceP.h
+++ b/tsourceP.h
@@ -33,13 +33,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
@@ -51,9 +51,9 @@ SOFTWARE.
 
 ******************************************************************/
 
-/* 
+/*
  * tocSourceP.h - Private definitions for tocSource widget
- * 
+ *
  */
 
 #ifndef _XawtocSourceP_h
diff --git a/util.c b/util.c
index 5752a84..2d3aca1 100644
--- a/util.c
+++ b/util.c
@@ -382,7 +382,7 @@ Toc SelectedToc(Scrn scrn)
 
     /* tocs of subfolders are created upon the first reference */
 
-    if ((toc = TocGetNamed(scrn->curfolder)) == NULL) 
+    if ((toc = TocGetNamed(scrn->curfolder)) == NULL)
         toc = TocCreate(scrn->curfolder);
     return toc;
 }
@@ -427,8 +427,8 @@ void InitBusyCursor(Scrn scrn)
     XSetWindowAttributes	attributes;
 
     /* the second condition is for the pick scrn */
-    if (! app_resources.block_events_on_busy || scrn->wait_window) 
-	return;	
+    if (! app_resources.block_events_on_busy || scrn->wait_window)
+	return;
 
     /* Ignore device events while the busy cursor is displayed. */
 
@@ -443,7 +443,7 @@ void InitBusyCursor(Scrn scrn)
      */
 
     scrn->wait_window =
-	XCreateWindow(XtDisplay(scrn->parent), XtWindow(scrn->parent), 0, 0, 
+	XCreateWindow(XtDisplay(scrn->parent), XtWindow(scrn->parent), 0, 0,
 		      rootwidth, rootheight, (unsigned int) 0, CopyFromParent,
 		      InputOnly, (Visual *)CopyFromParent, valuemask, &attributes);
 }
@@ -460,7 +460,7 @@ void ShowBusyCursor(void)
 void UnshowBusyCursor(void)
 {
     register int	i;
-    
+
     for (i=0; i < numScrns; i++)
 	if (scrnList[i]->mapped)
 	    XUnmapWindow(theDisplay, scrnList[i]->wait_window);
diff --git a/viewfuncs.c b/viewfuncs.c
index 234cc7b..ac2a924 100644
--- a/viewfuncs.c
+++ b/viewfuncs.c
@@ -44,13 +44,13 @@ void DoCloseView(
     confirms[0].closure = (XtPointer) scrn;
     confirms[1].callback = (XtCallbackProc) NULL;
     confirms[1].closure = (XtPointer) NULL;
-    
+
     if (MsgSetScrn((Msg) NULL, scrn, confirms, (XtCallbackList) NULL) ==
 	NEEDS_CONFIRMATION)
 	return;
     DestroyScrn(scrn);
 }
-    
+
 
 /*ARGSUSED*/
 void XmhCloseView(
@@ -161,7 +161,7 @@ void DoViewUseAsComposition(
     MsgSetScrnForComp(msg, nscrn);
     MapScrn(nscrn);
 }
-    
+
 
 /*ARGSUSED*/
 void XmhViewUseAsComposition(