applied parts of Connor Lane Smith's cleanup patch.

st.1

@@ -1,4 +1,4 @@
-.TH ST 1 st-VERSION
+.TH ST 1 st\-VERSION
 .SH NAME
 st \- simple terminal
 .SH SYNOPSIS
@@ -9,24 +9,24 @@ st \- simple terminal
 .IR title ]
 .RB [ \-v ]
 .RB [ \-e
-.IR cmd ]
+.IR command ...]
 .SH DESCRIPTION
 .B st
 is a simple terminal emulator.
 .SH OPTIONS
 .TP
-.B \-t title
+.BI \-t " title"
-Overrides the default title (st)
+defines the window title (default 'st').
 .TP
-.B \-c class
+.BI \-c " class"
-Overrides the default class ($TERM)
+defines the window class (default $TERM).
 .TP
 .B \-v
-Prints version information to standard output, then exits.
+prints version information to stderr, then exits.
 .TP
-.B \-e cmd [arguments]
+.BI \-e " program " [ " arguments " "... ]"
-Execute cmd instead of the shell. Type your command as you would on your
+st executes
-shell. If this option is used, it
+.I program
-.BI "must be the last"
+instead of the shell.  If this is used it
-on the command-line. This is the same behaviour as xterm/rxvt.
+.B must be the last option
-
+on the command line, as in xterm / rxvt.

st.c

@@ -34,8 +34,8 @@
 #endif
 
 #define USAGE \
-	"st-" VERSION ", (c) 2010 st engineers\n" \
+	"st-" VERSION ", (c) 2010-2011 st engineers\n" \
-	"usage: st [-t title] [-c class] [-v] [-e cmd]\n"
+	"usage: st [-t title] [-c class] [-v] [-e command...]\n"
 
 /* Arbitrary sizes */
 #define ESC_TITLE_SIZ 256
@@ -1908,16 +1908,16 @@ main(int argc, char *argv[]) {
 			if(++i < argc) opt_class = argv[i];
 			break;
 		case 'e': 
+			/* eat every remaining arguments */
 			if(++i < argc) opt_cmd = &argv[i];
-			break;
+			goto run;
 		case 'v':
 		default:
 			die(USAGE);
 		}
-		/* -e eats every remaining arguments */
-		if(opt_cmd)
-			break;
 	}
+
+ run:
 	setlocale(LC_CTYPE, "");
 	tnew(80, 24);
 	ttynew();