releng/15: top averages shifted

Hello,

after upgrading a test machine to "stable/15", I noticed,
running "top" under X-Windows in a standard size of 80x24,
that the 3 average values were now shifted to the right and
therefore the 15-min value got mostly hidden by the "up" time.

I found in commit b7f62c6042f8b4b322d9fa20a8c6a81a9a58c164
the explanation for that shift and tweaked 2 lines to get the old
display back for me:


diff --git a/usr.bin/top/display.c b/usr.bin/top/display.c
index b6cde0e63aa7..d76c33387659 100644
--- a/usr.bin/top/display.c
+++ b/usr.bin/top/display.c
@@ -97,7 +97,7 @@ static char * setup_buffer(char *, int);

  int  x_lastpid =       10;
  int  y_lastpid =       0;
-int  x_loadave =       33;
+int  x_loadave =       29;
  int  x_loadave_nompid =        15;
  int  y_loadave =       0;
  int  x_procstate =     0;
@@ -248,7 +248,7 @@ i_loadave(int mpid, double avenrun[])
         printf("last pid: %5d;  ", mpid);
      }

-    printf("load averages");
+    printf("load avgs");

      for (i = 0; i < 3; i++)
      {


Could this possibly be changed to restore the usual display behavior 
again for v15?


Thanks

Torsten