===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/menu.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/tmux/menu.c	2019/09/16 13:27:14	1.12
--- src/usr.bin/tmux/menu.c	2020/03/19 14:23:58	1.13
***************
*** 1,4 ****
! /* $OpenBSD: menu.c,v 1.12 2019/09/16 13:27:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: menu.c,v 1.13 2020/03/19 14:23:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 138,153 ****
  	struct screen		*s = &md->s;
  	struct menu		*menu = md->menu;
  	struct screen_write_ctx	 ctx;
! 	u_int			 i, px, py;
  
  	screen_write_start(&ctx, NULL, s);
  	screen_write_clearscreen(&ctx, 8);
  	screen_write_menu(&ctx, menu, md->choice);
  	screen_write_stop(&ctx);
  
- 	px = md->px;
- 	py = md->py;
- 
  	for (i = 0; i < screen_size_y(&md->s); i++)
  		tty_draw_line(tty, NULL, s, 0, i, menu->width + 4, px, py + i);
  
--- 138,150 ----
  	struct screen		*s = &md->s;
  	struct menu		*menu = md->menu;
  	struct screen_write_ctx	 ctx;
! 	u_int			 i, px = md->px, py = md->py;
  
  	screen_write_start(&ctx, NULL, s);
  	screen_write_clearscreen(&ctx, 8);
  	screen_write_menu(&ctx, menu, md->choice);
  	screen_write_stop(&ctx);
  
  	for (i = 0; i < screen_size_y(&md->s); i++)
  		tty_draw_line(tty, NULL, s, 0, i, menu->width + 4, px, py + i);
  
***************
*** 270,276 ****
  	pr = cmd_parse_from_string(item->command, NULL);
  	switch (pr->status) {
  	case CMD_PARSE_EMPTY:
- 		new_item = NULL;
  		break;
  	case CMD_PARSE_ERROR:
  		new_item = cmdq_get_error(pr->error);
--- 267,272 ----