summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/actions.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 590ee4c..56413ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-06 Shawn Betts <sabetts@vcn.bc.ca>
+
+ * src/actions.c (cmd_help): key descriptions don't run off the
+ bottom of the screen.
+
2002-03-23 Shawn Betts <sabetts@vcn.bc.ca>
* src/actions.c (command): look for the command in the aliases
diff --git a/src/actions.c b/src/actions.c
index 6f82590..875c235 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1471,7 +1471,8 @@ cmd_help (int interactive, void *data)
}
y += FONT_HEIGHT (defaults.font);
- if (y > s->root_attr.height)
+ /* Make sure the next line fits entirely within the window. */
+ if (y + FONT_HEIGHT (defaults.font) >= s->root_attr.height)
{
if (drawing_keys)
{
@@ -1483,6 +1484,7 @@ cmd_help (int interactive, void *data)
{
x += max_width + 20;
drawing_keys = 1;
+ i++;
old_i = i;
}