* The argument to the -w option is correctly recognized now.

This commit is contained in:
Gunnar Ritter 2005-02-13 01:03:22 +00:00
parent 6cba8d4b6c
commit 625b7e45f5
3 changed files with 13 additions and 11 deletions

View File

@ -12,6 +12,7 @@ Release ...
* The insertion of multicolumn characters and tab characters in multibyte * The insertion of multicolumn characters and tab characters in multibyte
locales now works with terminals that have the 'ic' but no 'im' termcap locales now works with terminals that have the 'ic' but no 'im' termcap
capability (Bugreport by Matthew Fischer). capability (Bugreport by Matthew Fischer).
* The argument to the -w option is correctly recognized now.
Release 1/19/05 Release 1/19/05
* The last release erroneously made 'X' work like 'x' in visual mode. It now * The last release erroneously made 'X' work like 'x' in visual mode. It now

19
ex.c
View File

@ -77,7 +77,7 @@ char *copyright =
"@(#) Copyright (c) 1980 Regents of the University of California.\n\ "@(#) Copyright (c) 1980 Regents of the University of California.\n\
All rights reserved.\n"; All rights reserved.\n";
static char sccsid[] = "@(#)ex.c 1.34 (gritter) 12/1/04"; static char sccsid[] = "@(#)ex.c 1.35 (gritter) 2/13/05";
#endif /* DOSCCS */ #endif /* DOSCCS */
#endif /* !lint */ #endif /* !lint */
@ -467,13 +467,13 @@ arggroup:
break; break;
case 't': case 't':
if (ac > 1 && av[1][0] != '-' && av[1][0] != '+') { if (av[0][2]) {
ac--, av++;
tflag = 1; tflag = 1;
safecp(lasttag, av[0], sizeof lasttag, safecp(lasttag, av[0], sizeof lasttag,
"argument to -t too long"); "argument to -t too long");
} } else if (ac > 1 && av[1][0] != '-' &&
else if (av[0][2]) { av[1][0] != '+') {
ac--, av++;
tflag = 1; tflag = 1;
safecp(lasttag, av[0], sizeof lasttag, safecp(lasttag, av[0], sizeof lasttag,
"argument to -t too long"); "argument to -t too long");
@ -490,11 +490,12 @@ arggroup:
break; break;
case 'w': case 'w':
if (ac > 1 && av[1][0] != '-' && av[1][0] != '+') if (av[0][2])
cp = av[1];
else if (av[0][2])
cp = &av[0][2]; cp = &av[0][2];
else else if (ac > 1 && av[1][0] != '-' && av[1][0] != '+') {
cp = av[1];
ac--, av++;
} else
needarg('w'); needarg('w');
defwind = atoi(cp); defwind = atoi(cp);
break; break;

View File

@ -70,12 +70,12 @@
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* Sccsid @(#)ex_version.c 1.122 (gritter) 2/4/05 * Sccsid @(#)ex_version.c 1.123 (gritter) 2/13/05
*/ */
#include "ex.h" #include "ex.h"
static char *versionstring = "@(#)Version 4.0 (gritter) 2/4/05"; static char *versionstring = "@(#)Version 4.0 (gritter) 2/13/05";
void void
printver(void) printver(void)