version 1.40, 2006/06/01 09:00:50 |
version 1.41, 2006/07/25 08:22:32 |
|
|
lp1 = curwp->w_dotp; |
lp1 = curwp->w_dotp; |
|
|
/* special case for the end */ |
/* special case for the end */ |
if (lp1 == curbp->b_linep) { |
if (lp1 == curbp->b_headp) { |
struct line *lp2, *lp3; |
struct line *lp2, *lp3; |
|
|
/* now should only happen in empty buffer */ |
/* now should only happen in empty buffer */ |
|
|
lp1 = curwp->w_dotp; |
lp1 = curwp->w_dotp; |
|
|
/* special case for the end */ |
/* special case for the end */ |
if (lp1 == curbp->b_linep) { |
if (lp1 == curbp->b_headp) { |
struct line *lp2, *lp3; |
struct line *lp2, *lp3; |
|
|
/* now should only happen in empty buffer */ |
/* now should only happen in empty buffer */ |
|
|
dotp = curwp->w_dotp; |
dotp = curwp->w_dotp; |
doto = curwp->w_doto; |
doto = curwp->w_doto; |
/* Hit the end of the buffer */ |
/* Hit the end of the buffer */ |
if (dotp == curbp->b_linep) |
if (dotp == curbp->b_headp) |
return (FALSE); |
return (FALSE); |
/* Size of the chunk */ |
/* Size of the chunk */ |
chunk = dotp->l_used - doto; |
chunk = dotp->l_used - doto; |
|
|
chunk = n; |
chunk = n; |
/* End of line, merge */ |
/* End of line, merge */ |
if (chunk == 0) { |
if (chunk == 0) { |
if (dotp == lback(curbp->b_linep)) |
if (dotp == lback(curbp->b_headp)) |
/* End of buffer */ |
/* End of buffer */ |
return (FALSE); |
return (FALSE); |
lchange(WFFULL); |
lchange(WFFULL); |
|
|
lp1 = curwp->w_dotp; |
lp1 = curwp->w_dotp; |
lp2 = lp1->l_fp; |
lp2 = lp1->l_fp; |
/* at the end of the buffer */ |
/* at the end of the buffer */ |
if (lp2 == curbp->b_linep) |
if (lp2 == curbp->b_headp) |
return (TRUE); |
return (TRUE); |
curwp->w_bufp->b_lines--; |
curwp->w_bufp->b_lines--; |
if (lp2->l_used <= lp1->l_size - lp1->l_used) { |
if (lp2->l_used <= lp1->l_size - lp1->l_used) { |