* If standard output is not a terminal, no '\r' is written at the end of

printed lines anymore.
This commit is contained in:
Gunnar Ritter 2005-02-17 15:16:43 +00:00
parent 9fd9a3d91e
commit 124bd15ee6
3 changed files with 14 additions and 8 deletions

View File

@ -33,6 +33,8 @@ Release ...
* The -w option now also sets the scroll size for the 'z' command. * The -w option now also sets the scroll size for the 'z' command.
* When the name of a nonexisting file is given with the 'edit' ex command, * When the name of a nonexisting file is given with the 'edit' ex command,
the command now succeeds and prints a "[New file]" message. the command now succeeds and prints a "[New file]" message.
* If standard output is not a terminal, no '\r' is written at the end of
printed lines anymore.
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

View File

@ -73,7 +73,7 @@
#ifndef lint #ifndef lint
#ifdef DOSCCS #ifdef DOSCCS
static char sccsid[] = "@(#)ex_put.c 1.31 (gritter) 2/15/05"; static char sccsid[] = "@(#)ex_put.c 1.32 (gritter) 2/17/05";
#endif #endif
#endif #endif
@ -604,10 +604,12 @@ plod(int cnt)
* BUG: this doesn't take the (possibly long) length * BUG: this doesn't take the (possibly long) length
* of xCR into account. * of xCR into account.
*/ */
if (xCR) if (ospeed != B0) {
tputs(xCR, 0, plodput); if (xCR)
else tputs(xCR, 0, plodput);
plodput('\r'); else
plodput('\r');
}
if (NC) { if (NC) {
if (xNL) if (xNL)
tputs(xNL, 0, plodput); tputs(xNL, 0, plodput);
@ -796,7 +798,7 @@ fgoto(void)
outcol %= TCOLUMNS; outcol %= TCOLUMNS;
if (AM == 0) { if (AM == 0) {
while (l > 0) { while (l > 0) {
if (pfast) if (pfast && ospeed != B0)
if (xCR) if (xCR)
tputs(xCR, 0, putch); tputs(xCR, 0, putch);
else else

View File

@ -73,7 +73,7 @@
#ifndef lint #ifndef lint
#ifdef DOSCCS #ifdef DOSCCS
static char sccsid[] = "@(#)ex_tty.c 1.28 (gritter) 2/17/05"; static char sccsid[] = "@(#)ex_tty.c 1.29 (gritter) 2/17/05";
#endif #endif
#endif #endif
@ -96,8 +96,10 @@ gettmode(void)
{ {
speed_t pospeed; speed_t pospeed;
if (tcgetattr(1, &tty) < 0) if (tcgetattr(1, &tty) < 0) {
ospeed = B0;
return; return;
}
pospeed = cfgetospeed(&tty); pospeed = cfgetospeed(&tty);
if (ospeed != pospeed) if (ospeed != pospeed)
value(SLOWOPEN) = pospeed < B1200; value(SLOWOPEN) = pospeed < B1200;