diff options
Diffstat (limited to 'src/cmd')
| -rw-r--r-- | src/cmd/acme/exec.c | 5 | ||||
| -rw-r--r-- | src/cmd/acme/text.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/cmd/acme/exec.c b/src/cmd/acme/exec.c index 882f7c31..a24e885d 100644 --- a/src/cmd/acme/exec.c +++ b/src/cmd/acme/exec.c @@ -556,9 +556,10 @@ get(Text *et, Text *t, Text *argt, int flag1, int _0, Rune *arg, int narg) d = dirstat(name); isdir = (d!=nil && (d->qid.type & QTDIR)); free(d); - if(isdir) + if(isdir){ warning(nil, "%s is a directory; can't read with multiple windows on it\n", name); - return; + return; + } } r = bytetorune(name, &n); for(i=0; i<t->file->ntext; i++){ diff --git a/src/cmd/acme/text.c b/src/cmd/acme/text.c index a69b46fe..6dc24bb7 100644 --- a/src/cmd/acme/text.c +++ b/src/cmd/acme/text.c @@ -659,7 +659,9 @@ texttype(Text *t, Rune r) n = t->fr.maxlines/3; goto case_Down; case Kscrollonedown: - n = 1; + n = mousescrollsize(t->fr.maxlines)-1; /* -1 counters a bug somewhere else */ + if(n <= 0) + n = 1; goto case_Down; case Kpgdown: n = 2*t->fr.maxlines/3; @@ -671,7 +673,7 @@ texttype(Text *t, Rune r) n = t->fr.maxlines/3; goto case_Up; case Kscrolloneup: - n = 2; /* feels like this should be n=1, but that does nothing */ + n = mousescrollsize(t->fr.maxlines)+1; /* +1 counters a bug somewhere else */ goto case_Up; case Kpgup: n = 2*t->fr.maxlines/3; |