[src/phil-wifi]: src/external/bsd/tmux/dist Fix merge botch

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0a59d1266cc6
branches:  phil-wifi
changeset: 1025129:0a59d1266cc6
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Apr 17 16:18:09 2020 +0000

description:
Fix merge botch

diffstat:

 external/bsd/tmux/dist/screen-write.c |  45 -----------------------------------
 1 files changed, 0 insertions(+), 45 deletions(-)

diffs (55 lines):

diff -r 628c94286acd -r 0a59d1266cc6 external/bsd/tmux/dist/screen-write.c
--- a/external/bsd/tmux/dist/screen-write.c     Fri Apr 17 13:44:37 2020 +0000
+++ b/external/bsd/tmux/dist/screen-write.c     Fri Apr 17 16:18:09 2020 +0000
@@ -448,51 +448,6 @@
        screen_write_set_cursor(ctx, cx, cy);
 }
 
-/* Draw a menu on screen. */
-void
-screen_write_menu(struct screen_write_ctx *ctx, struct menu *menu, int choice)
-{
-       struct screen           *s = ctx->s;
-       struct grid_cell         gc;
-       u_int                    cx, cy, i, j;
-       const char              *name;
-
-       cx = s->cx;
-       cy = s->cy;
-
-       memcpy(&gc, &grid_default_cell, sizeof gc);
-
-       screen_write_box(ctx, menu->width + 4, menu->count + 2);
-       screen_write_cursormove(ctx, cx + 2, cy, 0);
-       format_draw(ctx, &gc, menu->width, menu->title, NULL);
-
-       for (i = 0; i < menu->count; i++) {
-               name = menu->items[i].name;
-               if (name == NULL) {
-                       screen_write_cursormove(ctx, cx, cy + 1 + i, 0);
-                       screen_write_hline(ctx, menu->width + 4, 1, 1);
-               } else {
-                       if (choice >= 0 && i == (u_int)choice && *name != '-')
-                               gc.attr |= GRID_ATTR_REVERSE;
-                       screen_write_cursormove(ctx, cx + 2, cy + 1 + i, 0);
-                       for (j = 0; j < menu->width; j++)
-                               screen_write_putc(ctx, &gc, ' ');
-                       screen_write_cursormove(ctx, cx + 2, cy + 1 + i, 0);
-                       if (*name == '-') {
-                               name++;
-                               gc.attr |= GRID_ATTR_DIM;
-                               format_draw(ctx, &gc, menu->width, name, NULL);
-                               gc.attr &= ~GRID_ATTR_DIM;
-                       } else
-                               format_draw(ctx, &gc, menu->width, name, NULL);
-                       if (choice >= 0 && i == (u_int)choice)
-                               gc.attr &= ~GRID_ATTR_REVERSE;
-               }
-       }
-
-       screen_write_set_cursor(ctx, cx, cy);
-}
-
 /* Draw a box on screen. */
 void
 screen_write_box(struct screen_write_ctx *ctx, u_int nx, u_int ny)