Subversion Repositories planix.SVN

Rev

Rev 115 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 115 Rev 118
Line 209... Line 209...
209
	register char *cp, *cp1;
209
	register char *cp, *cp1;
210
 
210
 
211
	cp = genbuf;
211
	cp = genbuf;
212
	*cp = 0;
212
	*cp = 0;
213
	for (a1 = addr1; a1 <= addr2; a1++) {
213
	for (a1 = addr1; a1 <= addr2; a1++) {
214
		getline(*a1);
214
		ex_getline(*a1);
215
		cp1 = linebuf;
215
		cp1 = linebuf;
216
		if (a1 != addr1 && c == 0) {
216
		if (a1 != addr1 && c == 0) {
217
			while (*cp1 == ' ' || *cp1 == '\t')
217
			while (*cp1 == ' ' || *cp1 == '\t')
218
				cp1++;
218
				cp1++;
219
			if (*cp1 && cp > genbuf && cp[-1] != ' ' && cp[-1] != '\t') {
219
			if (*cp1 && cp > genbuf && cp[-1] != ' ' && cp[-1] != '\t') {
Line 330... Line 330...
330
getcopy()
330
getcopy()
331
{
331
{
332
 
332
 
333
	if (tad1 > addr2)
333
	if (tad1 > addr2)
334
		return (EOF);
334
		return (EOF);
335
	getline(*tad1++);
335
	ex_getline(*tad1++);
336
	return (0);
336
	return (0);
337
}
337
}
338
 
338
 
339
/*
339
/*
340
 * Put lines in the buffer from the undo save area.
340
 * Put lines in the buffer from the undo save area.
Line 342... Line 342...
342
getput()
342
getput()
343
{
343
{
344
 
344
 
345
	if (tad1 > unddol)
345
	if (tad1 > unddol)
346
		return (EOF);
346
		return (EOF);
347
	getline(*tad1++);
347
	ex_getline(*tad1++);
348
	tad1++;
348
	tad1++;
349
	return (0);
349
	return (0);
350
}
350
}
351
 
351
 
352
put()
352
put()
Line 386... Line 386...
386
	 * almost scrambling our addled brain.
386
	 * almost scrambling our addled brain.
387
	 */
387
	 */
388
	if (!kill)
388
	if (!kill)
389
		getDOT();
389
		getDOT();
390
	strcpy(genbuf, linebuf);
390
	strcpy(genbuf, linebuf);
391
	getline(*unddol);
391
	ex_getline(*unddol);
392
	if (kill)
392
	if (kill)
393
		*pkill[1] = 0;
393
		*pkill[1] = 0;
394
	strcat(linebuf, gp);
394
	strcat(linebuf, gp);
395
	putmark(unddol);
395
	putmark(unddol);
396
	getline(dol[1]);
396
	ex_getline(dol[1]);
397
	if (kill)
397
	if (kill)
398
		strcLIN(pkill[0]);
398
		strcLIN(pkill[0]);
399
	strcpy(gp, linebuf);
399
	strcpy(gp, linebuf);
400
	strcLIN(genbuf);
400
	strcLIN(genbuf);
401
	putmark(dol+1);
401
	putmark(dol+1);
Line 837... Line 837...
837
	if (dot > dol)
837
	if (dot > dol)
838
		dot = dol;
838
		dot = dol;
839
	if (addr1 > addr2)
839
	if (addr1 > addr2)
840
		return;
840
		return;
841
	if (op == EOF && zhadpr) {
841
	if (op == EOF && zhadpr) {
842
		getline(*addr1);
842
		ex_getline(*addr1);
843
		putchar('\r' | QUOTE);
843
		putchar('\r' | QUOTE);
844
		shudclob = 1;
844
		shudclob = 1;
845
	} else if (znoclear == 0 && CL != NOSTR && !inopen) {
845
	} else if (znoclear == 0 && CL != NOSTR && !inopen) {
846
		flush1();
846
		flush1();
847
		vclear();
847
		vclear();
Line 865... Line 865...
865
{
865
{
866
	register line *addr;
866
	register line *addr;
867
 
867
 
868
	pofix();
868
	pofix();
869
	for (addr = adr1; addr <= adr2; addr++) {
869
	for (addr = adr1; addr <= adr2; addr++) {
870
		getline(*addr);
870
		ex_getline(*addr);
871
		pline(lineno(addr));
871
		pline(lineno(addr));
872
		if (inopen)
872
		if (inopen)
873
			putchar('\n' | QUOTE);
873
			putchar('\n' | QUOTE);
874
		if (movedot)
874
		if (movedot)
875
			dot = addr;
875
			dot = addr;