o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Russ Cox 2009-04-30 07:29:24 -07:00
commit 4aad1a3258
7 changed files with 261 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/cmd/acme/text.c
View file

@ -734,6 +734,11 @@ texttype(Text *t, Rune r)
q0++;
textshow(t, q0, q0, TRUE);
return;
case Kcmd+'c': /* %C: copy */
typecommit(t);
cut(t, t, nil, TRUE, FALSE, nil, 0);
return;
Tagdown:
/* expand tag to show all text */
if(!t->w->tagexpand){
@ -755,6 +760,27 @@ texttype(Text *t, Rune r)
seq++;
filemark(t->file);
}
/* cut/paste must be done after the seq++/filemark */
switch(r){
case Kcmd+'x': /* %X: cut */
typecommit(t);
if(t->what == Body){
seq++;
filemark(t->file);
}
cut(t, t, nil, TRUE, TRUE, nil, 0);
textshow(t, t->q0, t->q0, 1);
return;
case Kcmd+'v': /* %V: paste */
typecommit(t);
if(t->what == Body){
seq++;
filemark(t->file);
}
paste(t, t, nil, TRUE, FALSE, nil, 0);
textshow(t, t->q0, t->q1, 1);
return;
}
if(t->q1 > t->q0){
if(t->ncache != 0)
error("text.type");