merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE

3 files changed, 10 insertions, 14 deletions

diff --git a/parse.c b/parse.c
index a65a031..153ccd8 100644
--- a/parse.c
+++ b/parse.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xditview/parse.c,v 1.5 2001/08/27 23:35:12 dawes Exp $ */
+/* $XFree86: xc/programs/xditview/parse.c,v 1.6 2003/05/27 22:27:00 tsi Exp $ */
 
 /*
  * parse.c
@@ -43,7 +43,6 @@ from the X Consortium.
 #include <ctype.h>
 #include "DviP.h"
 
-static int StopSeen = 0;
 static void ParseDrawFunction(DviWidget dw, char *buf);
 static void ParseDeviceControl(DviWidget dw);
 static void PutCharacters(DviWidget dw, unsigned char *src, int len);
@@ -83,8 +82,6 @@ ParseInput(dw)
 	int		otherc;
 	unsigned char	tc;
 
-	StopSeen = 0;
-
 	/*
 	 * make sure some state exists
 	 */
@@ -457,7 +454,6 @@ ParseDeviceControl(dw)				/* Parse the x commands */
     case 'p':				/* pause -- can restart */
 	break;
     case 's':				/* stop */
-	StopSeen = 1;
 	return;
     case 'r':				/* resolution when prepared */
 	SetDeviceResolution (dw, GetNumber (dw));
diff --git a/xditview.c b/xditview.c
index 6060c8f..a436b7a 100644
--- a/xditview.c
+++ b/xditview.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xditview/xditview.c,v 1.4 2001/08/27 23:35:12 dawes Exp $ */
+/* $XFree86: xc/programs/xditview/xditview.c,v 1.5 2003/05/27 22:27:00 tsi Exp $ */
 /*
  * xditview -- 
  *
@@ -101,7 +101,7 @@ static Widget	form, panner;
 static Widget	popupMenu;
 static Widget	menuBar;
 static Widget	fileMenuButton, fileMenu;
-static Widget	prevButton, pageNumber, nextButton;
+static Widget	pageNumber;
 
 static void	NextPage(Widget entry, XtPointer name, XtPointer data);
 static void	PreviousPage(Widget entry, XtPointer name, XtPointer data);
@@ -273,14 +273,14 @@ main(int argc, char **argv)
 	XtAddCallback (entry, XtNcallback, fileMenuEntries[i].function, NULL);
     }
 
-    prevButton = XtCreateManagedWidget ("prevButton", commandWidgetClass,
-					menuBar, NULL, (Cardinal) 0);
+    (void) XtCreateManagedWidget ("prevButton", commandWidgetClass,
+				  menuBar, NULL, (Cardinal) 0);
 
     pageNumber = XtCreateManagedWidget("pageNumber", asciiTextWidgetClass,
 					menuBar, NULL, (Cardinal) 0);
   
-    nextButton = XtCreateManagedWidget ("nextButton", commandWidgetClass,
-					 menuBar, NULL, (Cardinal) 0);
+    (void) XtCreateManagedWidget ("nextButton", commandWidgetClass,
+				  menuBar, NULL, (Cardinal) 0);
 
 #ifdef NOTDEF
     form = XtCreateManagedWidget ("form", formWidgetClass, paned,
diff --git a/xditview.man b/xditview.man
index 3e3f59e..96172ab 100644
--- a/xditview.man
+++ b/xditview.man
@@ -1,6 +1,6 @@
 .\" $XConsortium: xditview.man,v 1.10 94/04/17 20:43:37 gildea Exp $
 .\"
-.\" $XFree86: xc/programs/xditview/xditview.man,v 1.3 2001/01/27 18:21:10 dawes Exp $
+.\" $XFree86: xc/programs/xditview/xditview.man,v 1.5 2003/05/29 21:48:11 herrb Exp $
 .\"
 .TH XDITVIEW 1 __xorgversion__
 .SH NAME
@@ -43,7 +43,7 @@ requesting this resolution field in the XLFD names.
 .TP 8
 .B \-noPolyText
 Some X servers incorrectly implement PolyText with multiple strings
-per request.  This option suppesses the use of this feature in
+per request.  This option suppresses the use of this feature in
 .I xditview.
 .TP 8
 .B \-backingStore \fIbacking-store-type\fP
@@ -162,7 +162,7 @@ Portions of this program originated in
 from
 .I suntroff.  
 .SH COPYRIGHT
-Copyright ([\d,\s]*) X Consortium
+Copyright 1994 X Consortium
 .br
 See \fIX\fP(1) for a full statement of rights and permissions.
 .SH AUTHORS